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

Timestamp:

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

Author:

apeatling

Message:

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

File:

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

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

@@ -126 +126 @@
     $user_id = false;
     $page = 1;
+    $search_terms = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-members-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-members-filter'] ) && '-1' != $_COOKIE['bp-members-filter'] )
-        $type = $_COOKIE['bp-members-filter'];
-
-    if ( !empty( $_COOKIE['bp-members-page'] ) && '-1' != $_COOKIE['bp-members-page'] )
-        $page = $_COOKIE['bp-members-page'];
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
+
+    /* Pass a filter if ?s= is set. */
+    if ( $_REQUEST['s'] )
+        $search_terms = $_REQUEST['s'];
 
     // type: active ( default ) | random | newest | popular | online | alphabetical
@@ -148 +146 @@
 
         'user_id' => $user_id, // Pass a user_id to only show friends of this user
-        'search_terms' => false, // Pass search_terms to filter users by their profile data
+        'search_terms' => $search_terms, // Pass search_terms to filter users by their profile data
 
         'populate_extras' => true // Fetch usermeta? Friend count, last active etc.
@@ -160 +158 @@
             $per_page = $max;
     }
-
-    /* Pass a filter if ?s= is set. */
-    if ( $_REQUEST['s'] )
-        $search_terms = $_REQUEST['s'];
-
-    if ( false === $user_id && $bp->displayed_user->id )
-        $user_id = $bp->displayed_user->id;
 
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
@@ -1393 +1384 @@
     }
 
-/* This function will pass a AJAX built querystring to a loop in the template */
-function bp_ajax_querystring() {
-    global $bp;
-
-    return apply_filters( 'bp_ajax_querystring', $bp->ajax_querystring );
-}
-
 /* Template is_() functions to determine the current page */