Changeset 8447

Timestamp:

05/24/2014 12:13:51 PM (10 years ago)

Author:

boonebgorges

Message:

Set default search terms before function params are parsed in bp_has_blogs()

By getting the default value of the search_terms parameter from $_REQUEST
before parameters are parsed, we ensure that 'search_terms' is passed to the
bp_parse_args() filter in the same way as the rest of the function params.

See #5456 and r8116 for a similar change in bp_has_groups()

See #5660

File:

• trunk/src/bp-blogs/bp-blogs-template.php (modified) (3 diffs)

trunk/src/bp-blogs/bp-blogs-template.php

@@ -341 +341 @@
  *     @type array $include_blog_ids Array of blog IDs to limit results to.
  *     @type string $sort 'ASC' or 'DESC'. Default: 'DESC'.
- *     @type string $search_terms Limit results by a search term. Default: null.
+ *     @type string $search_terms Limit results by a search term. Default: the
+ *           value of $_REQUEST['s'], if present.
  *     @type int $user_id The ID of the user whose blogs should be retrieved.
  *           When viewing a user profile page, 'user_id' defaults to the ID of
@@ -358 +359 @@
     $type         = 'active';
     $user_id      = 0;
-    $search_terms = null;
 
     // User filtering
     if ( bp_displayed_user_id() )
         $user_id = bp_displayed_user_id();
+
+    if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) ) {
+        $search_terms = $_REQUEST['s'];
+    } else {
+        $search_terms = false;
+    }
 
     $defaults = array(
@@ -380 +386 @@
     $r = bp_parse_args( $args, $defaults, 'has_blogs' );
     extract( $r );
-
-    if ( is_null( $search_terms ) ) {
-        if ( isset( $_REQUEST['s'] ) && !empty( $_REQUEST['s'] ) )
-            $search_terms = $_REQUEST['s'];
-        else
-            $search_terms = false;
-    }
 
     if ( $max ) {