Changeset 2580 for trunk/bp-blogs/bp-blogs-templatetags.php

Timestamp:

02/04/2010 10:09:40 AM (17 years ago)

Author:

apeatling

Message:

Fixes #1793 - remove querystring building from theme and querystring cookie management from core.

File:

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

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

@@ -117 +117 @@
         $type = 'active';
         $user_id = false;
-        $page = 1;
+        $search_terms = false;
 
         /* User filtering */
-        if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-blogs-scope'] )
-                $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-        /* Action filtering */
-        if ( !empty( $_COOKIE['bp-blogs-filter'] ) && '-1' != $_COOKIE['bp-blogs-filter'] )
-                $type = $_COOKIE['bp-blogs-filter'];
-
-        if ( !empty( $_COOKIE['bp-blogs-page'] ) && '-1' != $_COOKIE['bp-blogs-page'] )
-                $page = $_COOKIE['bp-blogs-page'];
+        if ( !empty( $bp->displayed_user->id ) )
+                $user_id = $bp->displayed_user->id;
+
+        if ( !empty( $_REQUEST['s'] ) )
+                $search_terms = $_REQUEST['s'];
 
         $defaults = array(
                 'type' => $type,
-                'page' => $page,
+                'page' => 1,
                 'per_page' => 20,
                 'max' => false,
 
                 'user_id' => $user_id, // Pass a user_id to limit to only blogs this user has higher than subscriber access to
-                'search_terms' => false // Pass search terms to filter on the blog title or description.
+                'search_terms' => $search_terms // Pass search terms to filter on the blog title or description.
         );
 
         $r = wp_parse_args( $args, $defaults );
         extract( $r );
-
-        // type: active ( default ) | random | newest | alphabetical
-
-        if ( !empty( $_REQUEST['s'] ) )
-                $search_terms = $_REQUEST['s'];
 
         if ( $max ) {
@@ -154 +145 @@
 
         $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
-
         return $blogs_template->has_blogs();
 }