diff options
| -rw-r--r-- | engine/lib/river.php | 2 | ||||
| -rw-r--r-- | pages/river.php | 6 | ||||
| -rw-r--r-- | views/rss/river/item.php (renamed from views/rss/core/river/body.php) | 0 | ||||
| -rw-r--r-- | views/rss/river/item/list.php | 17 |
4 files changed, 5 insertions, 20 deletions
diff --git a/engine/lib/river.php b/engine/lib/river.php index 50663c966..80925a21d 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -325,6 +325,8 @@ function elgg_get_river(array $options = array()) { * @since 1.8.0 */ function elgg_list_river(array $options = array()) { + global $autofeed; + $autofeed = true; $defaults = array( 'offset' => (int) max(get_input('offset', 0), 0), diff --git a/pages/river.php b/pages/river.php index 728df50e1..7f2fce3d6 100644 --- a/pages/river.php +++ b/pages/river.php @@ -40,14 +40,14 @@ switch ($page_type) { break; } -$content = elgg_view('core/river/filter', array('selector' => $selector)); +$activity = elgg_list_river($options); -$content .= elgg_list_river($options); +$content = elgg_view('core/river/filter', array('selector' => $selector)); $sidebar = elgg_view('core/river/sidebar'); $params = array( - 'content' => $content, + 'content' => $content . $activity, 'sidebar' => $sidebar, 'buttons' => '', 'filter_context' => $page_filter, diff --git a/views/rss/core/river/body.php b/views/rss/river/item.php index f84e6ccf0..f84e6ccf0 100644 --- a/views/rss/core/river/body.php +++ b/views/rss/river/item.php diff --git a/views/rss/river/item/list.php b/views/rss/river/item/list.php deleted file mode 100644 index 3b2fc6179..000000000 --- a/views/rss/river/item/list.php +++ /dev/null @@ -1,17 +0,0 @@ -<?php -/** - * @package Elgg - * @subpackage Core - */ - -if (isset($vars['items']) && is_array($vars['items']) && !empty($vars['items'])) { - $i = 1; - foreach($vars['items'] as $item) { - if ($i++ >= $vars['limit']) { - break; - } - - $entity = get_entity($item->object_guid); - echo elgg_view_entity($entity); - } -} |