From fe1e3b3923659a4bea73e1596e0ba946f473635c Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 26 Jun 2011 15:56:35 -0400 Subject: this should update all the core pages and plugins using 'buttons' --- pages/river.php | 1 - 1 file changed, 1 deletion(-) (limited to 'pages/river.php') diff --git a/pages/river.php b/pages/river.php index 7f2fce3d6..fa559d59b 100644 --- a/pages/river.php +++ b/pages/river.php @@ -49,7 +49,6 @@ $sidebar = elgg_view('core/river/sidebar'); $params = array( 'content' => $content . $activity, 'sidebar' => $sidebar, - 'buttons' => '', 'filter_context' => $page_filter, 'class' => 'elgg-river-layout', ); -- cgit v1.2.3 From 3beedd84a7dbcf7a17a75248473302320653d231 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 2 Jul 2011 10:26:39 -0400 Subject: fixed river for #3544 --- engine/lib/river.php | 3 +++ pages/river.php | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'pages/river.php') diff --git a/engine/lib/river.php b/engine/lib/river.php index 36dde7f05..1a2be1e50 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -589,10 +589,13 @@ function elgg_river_page_handler($page) { elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); + // make a URL segment available in page handler script $page_type = elgg_extract(0, $page, 'all'); + $page_type = preg_replace('[\W]', '', $page_type); if ($page_type == 'owner') { $page_type = 'mine'; } + set_input('page_type', $page_type); // content filter code here $entity_type = ''; diff --git a/pages/river.php b/pages/river.php index fa559d59b..5770084ab 100644 --- a/pages/river.php +++ b/pages/river.php @@ -3,12 +3,12 @@ * 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')); +$active_section = +$subtype = preg_replace('[\W]', '', get_input('subtype', '')); if ($subtype) { $selector = "type=$type&subtype=$subtype"; } else { -- cgit v1.2.3