Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.17
diff -u -p -r1.17 aggregator.install
--- modules/aggregator/aggregator.install	12 Aug 2008 07:00:48 -0000	1.17
+++ modules/aggregator/aggregator.install	7 Sep 2008 11:01:10 -0000
@@ -228,7 +228,7 @@ function aggregator_schema() {
         'default' => '',
         'description' => t('Author of the feed item.'),
       ),
-      'description' => array(
+      'body' => array(
         'type' => 'text',
         'not null' => TRUE,
         'size' => 'big',
@@ -263,3 +263,9 @@ function aggregator_update_7000() {
   db_add_field($ret, 'aggregator_feed', 'hash', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''));
   return $ret;
 }
+
+function aggregator_update_7001() {
+  $ret = array();
+  db_change_field($ret, 'aggregator_item', 'description', 'body', array('type' => 'text', 'not null' => TRUE, 'size' => 'big'));
+  return $ret;
+}
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.391
diff -u -p -r1.391 aggregator.module
--- modules/aggregator/aggregator.module	6 Sep 2008 08:36:19 -0000	1.391
+++ modules/aggregator/aggregator.module	7 Sep 2008 11:01:10 -0000
@@ -732,9 +732,9 @@ function aggregator_parse_feed(&$data, $
   $items = array_reverse($items);
 
   // Initialize variables.
-  $title = $link = $author = $description = $guid = NULL;
+  $title = $link = $author = $body = $guid = NULL;
   foreach ($items as $item) {
-    unset($title, $link, $author, $description, $guid);
+    unset($title, $link, $author, $body, $guid);
 
     // Prepare the item:
     foreach ($item as $key => $value) {
@@ -806,7 +806,7 @@ function aggregator_parse_feed(&$data, $
       $timestamp = isset($entry->timestamp) ? $entry->timestamp : $_SERVER['REQUEST_TIME'];
     }
     $item += array('AUTHOR' => '', 'DESCRIPTION' => '');
-    aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $guid));
+    aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'body' => $item['DESCRIPTION'], 'guid' => $guid));
   }
 
   // Remove all items that are older than flush item timer.
@@ -835,14 +835,14 @@ function aggregator_parse_feed(&$data, $
  */
 function aggregator_save_item($edit) {
   if ($edit['iid'] && $edit['title']) {
-    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['guid'], $edit['timestamp'], $edit['iid']);
+    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', body = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['body'], $edit['guid'], $edit['timestamp'], $edit['iid']);
   }
   elseif ($edit['iid']) {
     db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']);
     db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']);
   }
   elseif ($edit['title'] && $edit['link']) {
-    db_query("INSERT INTO {aggregator_item} (fid, title, link, author, description, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']);
+    db_query("INSERT INTO {aggregator_item} (fid, title, link, author, body, timestamp, guid) VALUES (%d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['body'], $edit['timestamp'], $edit['guid']);
     $edit['iid'] = db_last_insert_id('aggregator_item', 'iid');
     // file the items in the categories indicated by the feed
     $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.17
diff -u -p -r1.17 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc	6 Sep 2008 08:36:19 -0000	1.17
+++ modules/aggregator/aggregator.pages.inc	7 Sep 2008 11:01:11 -0000
@@ -256,7 +256,7 @@ function template_preprocess_aggregator_
 
   $variables['feed_url'] = check_url($item->link);
   $variables['feed_title'] = check_plain($item->title);
-  $variables['content'] = aggregator_filter_xss($item->description);
+  $variables['content'] = aggregator_filter_xss($item->body);
 
   $variables['source_url'] = '';
   $variables['source_title'] = '';
@@ -366,17 +366,17 @@ function theme_aggregator_page_rss($feed
   foreach ($feeds as $feed) {
     switch ($feed_length) {
       case 'teaser':
-        $teaser = node_teaser($feed->description);
-        if ($teaser != $feed->description) {
+        $teaser = node_teaser($feed->body);
+        if ($teaser != $feed->body) {
           $teaser .= '<p><a href="' . check_url($feed->link) . '">' . t('read more') . "</a></p>\n";
         }
-        $feed->description = $teaser;
+        $feed->body = $teaser;
         break;
       case 'title':
-        $feed->description = '';
+        $feed->body = '';
         break;
     }
-    $items .= format_rss_item($feed->ftitle . ': ' . $feed->title, $feed->link, $feed->description, array('pubDate' => date('r', $feed->timestamp)));
+    $items .= format_rss_item($feed->ftitle . ': ' . $feed->title, $feed->link, $feed->body, array('pubDate' => date('r', $feed->timestamp)));
   }
 
   $site_name = variable_get('site_name', 'Drupal');