fixed river for #3544

diff --git a/engine/lib/river.php b/engine/lib/river.php
index 36dde7f05728413f7d4af43b8da44d7bed1363d2..1a2be1e5067dd0f66362a4553ea9b5a0f6c6a49f 100644 (file)
--- 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 fa559d59b10ca7426100ba9de181f8bc78ce6dbf..5770084aba3efdcf6e89fc3ddc8b72812202e9eb 100644 (file)
--- 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 {