Changeset 2980

Timestamp:

04/03/2011 06:44:19 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Introduce bbp_is_query_name() function to make checking the '_bbp_query_name' query variable easier, and use this function through-out.

Fix bug where topic and reply widgets would selfishly listen to pagination query vars.

Fix bug when viewing a single topic, replies widget would only show replies from that topic.

Location:

branches/plugin/bbp-includes

Files:

• bbp-general-functions.php (modified) (4 diffs)
• bbp-general-template.php (modified) (7 diffs)
• bbp-reply-template.php (modified) (2 diffs)
• bbp-widgets.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-general-functions.php

@@ -187 +187 @@
  */
 function bbp_get_paged() {
-    if ( $paged = get_query_var( 'paged' ) )
+
+    // Make sure to not paginate widget queries
+    if ( !bbp_is_query_name( 'bbp_widget' ) && ( $paged = get_query_var( 'paged' ) ) )
         return (int) $paged;
 
+    // Default to first page
     return 1;
 }
@@ -839 +842 @@
  * @uses apply_filters() Calls 'enable_edit_any_user_configuration' with true
  * @uses wp_die() To die
- * @uses bbp_get_query_name() To get the query name and check if it's 'bbp_widget'
+ * @uses bbp_is_query_name() Check if query name is 'bbp_widget'
  * @uses bbp_get_view_query_args() To get the view query args
  * @uses bbp_get_topic_post_type() To get the topic post type
@@ -915 +918 @@
 
         // Make sure 404 is not set
-        $posts_query->is_404 = false;
+        $posts_query->is_404  = false;
 
         // Correct is_home variable
@@ -924 +927 @@
 
         // Set author_name as current user's nicename to get correct posts
-        if ( 'bbp_widget' != bbp_get_query_name() )
+        if ( !bbp_is_query_name( 'bbp_widget' ) )
             $posts_query->query_vars['author_name'] = $user->user_nicename;
 

branches/plugin/bbp-includes/bbp-general-template.php

@@ -217 +217 @@
  *                                to true.
  * @uses bbp_is_user_profile_page() To check if it's the user profile page
- * @uses bbp_get_query_name() To get the query name
+ * @uses bbp_is_query_name() To get the query name
  * @return bool True if it's the favorites page, false if not
  */
@@ -224 +224 @@
         return false;
 
-    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_favorites' != bbp_get_query_name() ) )
+    if ( !empty( $query_name_check ) && ( !bbp_is_query_name( 'bbp_user_profile_favorites' ) ) )
         return false;
 
@@ -240 +240 @@
  *                                to true.
  * @uses bbp_is_user_profile_page() To check if it's the user profile page
- * @uses bbp_get_query_name() To get the query name
+ * @uses bbp_is_query_name() To get the query name
  * @return bool True if it's the subscriptions page, false if not
  */
@@ -247 +247 @@
         return false;
 
-    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_subscriptions' != bbp_get_query_name() ) )
+    if ( !empty( $query_name_check ) && ( !bbp_is_query_name( 'bbp_user_profile_subscriptions' ) ) )
         return false;
 
@@ -264 +264 @@
  *                                to true.
  * @uses bbp_is_user_profile_page() To check if it's the user profile page
- * @uses bbp_get_query_name() To get the query name
+ * @uses bbp_is_query_name() To get the query name
  * @return bool True if it's the topics created page, false if not
  */
@@ -271 +271 @@
         return false;
 
-    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_topics_created' != bbp_get_query_name() ) )
+    if ( !empty( $query_name_check ) && ( !bbp_is_query_name( 'bbp_user_profile_topics_created' ) ) )
         return false;
 
@@ -994 +994 @@
 
 /**
+ * Check the passed parameter against the current _bbp_query_name
+ *
+ * @since bbPress (r2780)
+ *
+ * @uses bbp_get_query_name() Get the query var '_bbp_query_name'
+ * @return bool True if match, false if not
+ */
+function bbp_is_query_name( $query_name )  {
+
+    // No empties
+    if ( empty( $query_name ) )
+        return false;
+
+    // Check if query var matches
+    if ( bbp_get_query_name() == $query_name )
+        return true;
+
+    // No match
+    return false;
+}
+
+/**
  * Get the '_bbp_query_name' setting
  *

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -62 +62 @@
 
             // Query only by post_parent
-            'post_parent' => bbp_get_topic_id(),
+            'post_parent' => bbp_is_topic() ? bbp_get_topic_id() : 'any',
 
             // Narrow query down to bbPress replies
@@ -71 +71 @@
     } else {
 
-        $parent_args = array(
+        // Skip topic_id if in the replies widget query
+        if ( !bbp_is_query_name( 'bbp_widget' ) ) {
 
             // Query by post meta instead of post_parent
-            'meta_key'    => '_bbp_topic_id',
-            'meta_value'  => bbp_get_topic_id(),
-
-            // Include both topic and reply in the loop
-            'post_type'   => array( bbp_get_topic_post_type(), bbp_get_reply_post_type() )
-        );
-
-        // Manually set the post_parent variable
-        $post_parent = bbp_get_topic_id();
+            $parent_args['meta_key']   = '_bbp_topic_id';
+            $parent_args['meta_value'] = bbp_get_topic_id();
+
+            // Manually set the post_parent variable
+            $post_parent = bbp_get_topic_id();
+        }
+
+        // Include both topic and reply in the loop
+        $parent_args['post_type'] = array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
+
     }
 

branches/plugin/bbp-includes/bbp-widgets.php

@@ -495 +495 @@
      * @param array $instance
      * @uses apply_filters() Calls 'bbp_reply_widget_title' with the title
+     * @uses bbp_set_query_name() To set the query name to 'bbp_widget'
+     * @uses bbp_reset_query_name() To reset the query name
      * @uses bbp_has_replies() The main reply loop
      * @uses bbp_replies() To check whether there are more replies available