diff options
| author | cash <cash.costello@gmail.com> | 2011-07-02 10:26:39 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-07-02 10:26:39 -0400 |
| commit | 3beedd84a7dbcf7a17a75248473302320653d231 (patch) | |
| tree | 8bdb6a30f8a92c6f609f3250e2e50f33e9bdd903 | |
| parent | b307bcbdc8b0f269a5408a824dc4a7c3c2e9570f (diff) | |
| download | elgg-3beedd84a7dbcf7a17a75248473302320653d231.tar.gz elgg-3beedd84a7dbcf7a17a75248473302320653d231.tar.bz2 | |
fixed river for #3544
| -rw-r--r-- | engine/lib/river.php | 3 | ||||
| -rw-r--r-- | pages/river.php | 8 |
2 files changed, 7 insertions, 4 deletions
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 { |