Changeset 2580 for trunk/bp-forums/bp-forums-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-forums/bp-forums-templatetags.php (modified) (2 diffs)

trunk/bp-forums/bp-forums-templatetags.php

@@ -163 +163 @@
     $type = 'newest';
     $user_id = false;
-    $page = 1;
+    $forum_id = false;
+    $search_terms = false;
 
     /* User filtering */
-    if ( !empty( $bp->displayed_user->id ) || 'personal' == $_COOKIE['bp-forums-scope'] )
-        $user_id = ( !empty( $bp->displayed_user->id ) ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
-
-    /* Action filtering */
-    if ( !empty( $_COOKIE['bp-forums-filter'] ) && '-1' != $_COOKIE['bp-forums-filter'] )
-        $type = $_COOKIE['bp-forums-filter'];
-
-    if ( !empty( $_COOKIE['bp-forums-page'] ) && '-1' != $_COOKIE['bp-forums-page'] )
-        $page = $_COOKIE['bp-forums-page'];
-
-    $defaults = array(
-        'type' => $type,
-        'forum_id' => false,
-        'user_id' => $user_id,
-        'page' => $page,
-        'per_page' => 20,
-        'max' => false,
-        'no_stickies' => false,
-        'search_terms' => false
-    );
-
-    $r = wp_parse_args( $args, $defaults );
-    extract( $r );
+    if ( !empty( $bp->displayed_user->id ) )
+        $user_id = $bp->displayed_user->id;
 
     /* If we're in a single group, set this group's forum_id */
@@ -211 +191 @@
         $search_terms = $_GET['fs'];
 
+    $defaults = array(
+        'type' => $type,
+        'forum_id' => $forum_id,
+        'user_id' => $user_id,
+        'page' => 1,
+        'per_page' => 20,
+        'max' => false,
+        'no_stickies' => false,
+        'search_terms' => $search_terms
+    );
+
+    $r = wp_parse_args( $args, $defaults );
+    extract( $r );
+
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms );
-
     return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
 }