Changeset 3449 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

11/19/2010 07:41:13 PM (16 years ago)

Author:

djpaul

Message:

Add missing files from previous commit (r3448); don't allow the URL to override search parameters hardcoded in templates.

File:

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

trunk/bp-core/bp-core-templatetags.php

@@ -124 +124 @@
         $user_id = false;
         $page = 1;
-        $search_terms = false;
+        $search_terms = null;
 
         // User filtering
         if ( !empty( $bp->displayed_user->id ) )
                 $user_id = $bp->displayed_user->id;
-
-        // Pass a filter if ?s= is set.
-        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
-                $search_terms = $_REQUEST['s'];
 
         // type: active ( default ) | random | newest | popular | online | alphabetical
@@ -152 +148 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r );
+
+        // Pass a filter if ?s= is set.
+        if ( is_null( $search_terms ) ) {
+                if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+                        $search_terms = $_REQUEST['s'];
+                else
+                        $search_terms = false;
+        }
 
         if ( $max ) {