commit 01126ed4309794b60c1d15f80bd6e667e50ac628 Author: Joel Pittet Date: Mon Apr 8 22:46:27 2013 -0700 fixes diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index ccf9062..5ca6ea2 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -53,11 +53,7 @@ function aggregator_help($path, $arg) { function aggregator_theme() { return array( 'aggregator_feed_source' => array( - 'variables' => array( - 'feed' => NULL, - 'aggregator_feed' => NULL, - 'view_mode' => NULL - ), + 'variables' => array('aggregator_feed' => NULL, 'view_mode' => NULL), 'file' => 'aggregator.pages.inc', 'template' => 'aggregator-feed-source', ), diff --git a/core/modules/node/node.module b/core/modules/node/node.module index 8d3e897..f8b42fb 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -2127,8 +2127,8 @@ function node_feed($nids = FALSE, $channel = array()) { $item = new stdClass(); $item->title = $node->label(); $item->link = $node->link; - $feed->description = $item_text; - $feed->args = $node->rss_elements; + $item->description = $item_text; + $item->args = $node->rss_elements; $items[] = $item; } @@ -2143,11 +2143,12 @@ function node_feed($nids = FALSE, $channel = array()) { $channel_extras = array_diff_key($channel, $channel_defaults); $channel = array_merge($channel_defaults, $channel); - return array( + $build = array( '#theme' => 'aggregator_page_rss', '#category' => (object) $channel, '#feeds' => $items, ); + return $build; } /**