Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.388
diff -u -r1.388 aggregator.module
--- modules/aggregator/aggregator.module	12 Aug 2008 10:42:41 -0000	1.388
+++ modules/aggregator/aggregator.module	15 Aug 2008 12:02:28 -0000
@@ -465,7 +465,6 @@
   switch ($name) {
     case 'IMAGE':
     case 'TEXTINPUT':
-    case 'CONTENT':
     case 'SUMMARY':
     case 'TAGLINE':
     case 'SUBTITLE':
@@ -495,6 +494,11 @@
       $element = 'ITEM';
       $item += 1;
       break;
+    case 'CONTENT':
+      if ($element != 'ITEM') {
+        $element = $name;
+      }
+      break;
   }
 
   $tag = $name;
@@ -511,7 +515,6 @@
     case 'TEXTINPUT':
     case 'ITEM':
     case 'ENTRY':
-    case 'CONTENT':
     case 'INFO':
       $element = '';
       break;