Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.389
diff -u -r1.389 aggregator.module
--- modules/aggregator/aggregator.module	16 Aug 2008 14:48:17 -0000	1.389
+++ modules/aggregator/aggregator.module	23 Aug 2008 09:12:47 -0000
@@ -614,6 +614,7 @@
       // Filter the input data.
       if (aggregator_parse_feed($result->data, $feed)) {
         $modified = empty($result->headers['Last-Modified']) ? 0 : strtotime($result->headers['Last-Modified']);
+        $etag = empty($result->headers['ETag']) ? '' : $result->headers['ETag'];
 
         // Prepare the channel data.
         foreach ($channel as $key => $value) {
@@ -634,7 +635,7 @@
           $image = NULL;
         }
 
-        $etag = empty($result->headers['ETag']) ? '' : $result->headers['ETag'];
+        $channel += array('LINK' => '', 'DESCRIPTION' => '');
         // Update the feed data.
         db_query("UPDATE {aggregator_feed} SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', hash = '%s', etag = '%s', modified = %d WHERE fid = %d", $feed['url'], time(), $channel['LINK'], $channel['DESCRIPTION'], $image, $md5, $etag, $modified, $feed['fid']);