- Patch #372743 by bjaspan, yched, KarenS, catch et al: node body and teasers as fields. Oh, my.

2 files changed, 5 insertions, 5 deletions

diff --git a/modules/aggregator/aggregator.pages.inc b/modules/aggregator/aggregator.pages.inc
index 5c5d0c70c..3884f509f 100644
--- a/modules/aggregator/aggregator.pages.inc
+++ b/modules/aggregator/aggregator.pages.inc
@@ -378,11 +378,11 @@ function theme_aggregator_page_rss($feeds, $category = NULL) {
   foreach ($feeds as $feed) {
     switch ($feed_length) {
       case 'teaser':
-        $teaser = node_teaser($feed->description, NULL, variable_get('aggregator_teaser_length', 600));
-        if ($teaser != $feed->description) {
-          $teaser .= '<p><a href="' . check_url($feed->link) . '">' . t('read more') . "</a></p>\n";
+        $summary = text_summary($feed->description, NULL, variable_get('aggregator_teaser_length', 600));
+        if ($summary != $feed->description) {
+          $summary .= '<p><a href="' . check_url($feed->link) . '">' . t('read more') . "</a></p>\n";
         }
-        $feed->description = $teaser;
+        $feed->description = $summary;
         break;
       case 'title':
         $feed->description = '';
diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index aa9e1db59..4abef3721 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -252,7 +252,7 @@ EOF;
     for ($i = 0; $i < 5; $i++) {
       $edit = array();
       $edit['title'] = $this->randomName();
-      $edit['body'] = $this->randomName();
+      $edit['body[0][value]'] = $this->randomName();
       $this->drupalPost('node/add/article', $edit, t('Save'));
     }
   }