diff options
Diffstat (limited to 'pages/river.php')
| -rw-r--r-- | pages/river.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pages/river.php b/pages/river.php index 120ad4b57..801d9f664 100644 --- a/pages/river.php +++ b/pages/river.php @@ -3,12 +3,11 @@ * Main activity stream list page */ -// $page_type comes from the page handler function - $options = array(); -$type = get_input('type', 'all'); -$subtype = get_input('subtype', ''); +$page_type = preg_replace('[\W]', '', get_input('page_type', 'all')); +$type = preg_replace('[\W]', '', get_input('type', 'all')); +$subtype = preg_replace('[\W]', '', get_input('subtype', '')); if ($subtype) { $selector = "type=$type&subtype=$subtype"; } else { @@ -26,12 +25,12 @@ switch ($page_type) { case 'mine': $title = elgg_echo('river:mine'); $page_filter = 'mine'; - $options['subject_guid'] = get_loggedin_userid(); + $options['subject_guid'] = elgg_get_logged_in_user_guid(); break; case 'friends': $title = elgg_echo('river:friends'); $page_filter = 'friends'; - $options['relationship_guid'] = get_loggedin_userid(); + $options['relationship_guid'] = elgg_get_logged_in_user_guid(); $options['relationship'] = 'friend'; break; default: @@ -40,16 +39,19 @@ switch ($page_type) { break; } -$content = elgg_view('core/river/filter', array('selector' => $selector)); +$activity = elgg_list_river($options); +if (!$activity) { + $activity = elgg_echo('river:none'); +} -$content .= elgg_list_river($options); +$content = elgg_view('core/river/filter', array('selector' => $selector)); $sidebar = elgg_view('core/river/sidebar'); $params = array( - 'content' => $content, + 'title' => $title, + 'content' => $content . $activity, 'sidebar' => $sidebar, - 'buttons' => '', 'filter_context' => $page_filter, 'class' => 'elgg-river-layout', ); |