Changeset 3449 for trunk/bp-groups/bp-groups-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-groups/bp-groups-templatetags.php (modified) (4 diffs)

trunk/bp-groups/bp-groups-templatetags.php

@@ -139 +139 @@
         $type = 'active';
         $user_id = false;
-        $search_terms = false;
+        $search_terms = null;
         $slug = false;
 
@@ -160 +160 @@
         }
 
-        if ( isset( $_REQUEST['group-filter-box'] ) || isset( $_REQUEST['s'] ) )
-                $search_terms = ( isset( $_REQUEST['group-filter-box'] ) ) ? $_REQUEST['group-filter-box'] : $_REQUEST['s'];
-
         $defaults = array(
                 'type' => $type,
@@ -180 +177 @@
         $r = wp_parse_args( $args, $defaults );
         extract( $r );
+
+        if ( is_null( $search_terms ) ) {
+                if ( isset( $_REQUEST['group-filter-box'] ) && !empty( $_REQUEST['group-filter-box'] ) )
+                        $search_terms = $_REQUEST['group-filter-box'];
+                elseif ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
+                        $search_terms = $_REQUEST['s'];
+                else
+                        $search_terms = false;
+        }
 
         $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude );
@@ -1812 +1818 @@
 
         $search_value = __( 'Search anything...', 'buddypress' );
-        if ( !empty( $_REQUEST['s'] ) )
+        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
                 $search_value = $_REQUEST['s'];