Index: aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.247
diff -u -w -b -r1.247 aggregator.module
--- aggregator.module	22 Aug 2005 19:45:42 -0000	1.247
+++ aggregator.module	22 Aug 2005 23:26:52 -0000
@@ -351,10 +351,10 @@
       }
       break;
     case 'CONTENT':
-      $items[$item]['DESCRIPTION'] .= $data;
+      $items[$item]['CONTENT'] .= $data;
       break;
     case 'SUMMARY':
-      $items[$item]['DESCRIPTION'] .= $data;
+      $items[$item]['SUMMARY'] .= $data;
       break;
     case 'TAGLINE':
     case 'SUBTITLE':
@@ -559,6 +559,14 @@
       $link = $feed['link'];
     }
 
+    /**
+     * Atom feeds have a CONTENT and/or SUMMARY tag instead of a DESCRIPTION tag
+     */
+    if ($item['CONTENT']) {
+      $item['DESCRIPTION'] = $item['CONTENT'];
+    } else if ($item['SUMMARY']) {
+      $item['DESCRIPTION'] = $item['SUMMARY'];
+    }
     /*
     ** Try to resolve and parse the item's publication date.  If no
     ** date is found, we use the current date instead.