Changeset 3448

Timestamp:

11/19/2010 07:39:29 PM (14 years ago)

Author:

djpaul

Message:

Don't allow the URL to override search parameters hardcoded in templates. Fixes #2747.

File:

• trunk/bp-blogs/bp-blogs-templatetags.php (modified) (2 diffs)

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -120 +120 @@
     $type = 'active';
     $user_id = false;
-    $search_terms = false;
+    $search_terms = null;
 
     /* User filtering */
     if ( !empty( $bp->displayed_user->id ) )
         $user_id = $bp->displayed_user->id;
-
-    if ( !empty( $_REQUEST['s'] ) )
-        $search_terms = $_REQUEST['s'];
 
     $defaults = array(
@@ -141 +138 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r );
+
+    if ( is_null( $search_terms ) ) {
+        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+            $search_terms = $_REQUEST['s'];
+        else
+            $search_terms = false;
+    }
 
     if ( $max ) {