Index: modules/aggregator/aggregator.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.install,v
retrieving revision 1.19
diff -u -p -r1.19 aggregator.install
--- modules/aggregator/aggregator.install 15 Nov 2008 13:01:04 -0000  1.19
+++ modules/aggregator/aggregator.install 17 Nov 2008 21:50:20 -0000
@@ -228,7 +228,7 @@ function aggregator_schema() {
         'default' => '',
         'description' => 'Author of the feed item.',
       ),
-      'description' => array(
+      'body' => array(
         'type' => 'text',
         'not null' => TRUE,
         'size' => 'big',
@@ -263,3 +263,12 @@ function aggregator_update_7000() {
   db_add_field($ret, 'aggregator_feed', 'hash', array('type' => 'varchar', 'length' => 32, 'not null' => TRUE, 'default' => ''));
   return $ret;
 }
+
+/**
+ * Rename 'description' column to 'body' in {aggregator_item}.
+ */
+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.401
diff -u -p -r1.401 aggregator.module
--- modules/aggregator/aggregator.module  16 Nov 2008 04:38:15 -0000  1.401
+++ modules/aggregator/aggregator.module  17 Nov 2008 21:50:21 -0000
@@ -811,9 +811,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) {
@@ -885,7 +885,7 @@ function aggregator_parse_feed(&$data, $
       $timestamp = isset($entry->timestamp) ? $entry->timestamp : 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.
@@ -916,7 +916,7 @@ function aggregator_save_item($edit) {
         'title' => $edit['title'],
         'link' => $edit['link'],
         'author' => $edit['author'],
-        'description' => $edit['description'],
+        'body' => $edit['body'],
         'guid' => $edit['guid'],
         'timestamp' => $edit['timestamp'],
         'fid' => $edit['fid'],
Index: modules/aggregator/aggregator.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v
retrieving revision 1.22
diff -u -p -r1.22 aggregator.pages.inc
--- modules/aggregator/aggregator.pages.inc 20 Oct 2008 12:57:35 -0000  1.22
+++ modules/aggregator/aggregator.pages.inc 17 Nov 2008 21:50:21 -0000
@@ -275,7 +275,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'] = '';
@@ -379,17 +379,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');