Changeset 3637

Timestamp:

11/27/2011 11:05:06 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Use pre-query-filters in shortcodes, and fix topic-tag query. Fixes #1687, props ptahdunbar for original patch.

Location:

branches/plugin

Files:

• bbp-includes/bbp-core-shortcodes.php (modified) (9 diffs)
• bbp-includes/bbp-topic-template.php (modified) (2 diffs)
• bbp-themes/bbp-twentyten/css/bbpress.css (modified) (1 diff)
• bbpress.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-core-shortcodes.php

@@ -141 +141 @@
 
         // Unset global ID's
-        $bbp->current_forum_id = 0;
-        $bbp->current_topic_id = 0;
-        $bbp->current_reply_id = 0;
+        $bbp->current_forum_id     = 0;
+        $bbp->current_topic_id     = 0;
+        $bbp->current_reply_id     = 0;
+        $bbp->current_topic_tag_id = 0;
 
         // Reset the post data
@@ -248 +249 @@
 
         // Set passed attribute to $forum_id for clarity
-        $forum_id = $attr['id'];
+        $bbp->current_forum_id = $forum_id = $attr['id'];
 
         // Bail if ID passed is not a forum
@@ -313 +314 @@
         $this->start( 'bbp_topic_archive' );
 
-        // Query defaults
-        $topics_query = array(
-            'author'        => 0,
-            'show_stickies' => true,
-            'order'         => 'DESC',
-        );
-
-        // Load the topic index
-        bbp_has_topics( $topics_query );
+        // Filter the query
+        add_filter( 'bbp_pre_has_topics_query', array( $this, 'display_topic_index_query' ) );
 
         // Output template
@@ -351 +345 @@
 
         // Set passed attribute to $forum_id for clarity
-        $topic_id = $attr['id'];
+        $bbp->current_topic_id = $topic_id = $attr['id'];
         $forum_id = bbp_get_topic_forum_id( $topic_id );
 
@@ -381 +375 @@
         if ( bbp_user_can_view_forum( array( 'forum_id' => $forum_id ) ) ) {
 
-            // Setup the meta_query
-            $replies_query['meta_query'] = array( array(
-                'key'     => '_bbp_topic_id',
-                'value'   => $topic_id,
-                'compare' => '='
-            ) );
-
-            // Setup an accurate replies query
-            bbp_has_replies( $replies_query );
-
-            // Output the single topic
+            // Filter the query
+            add_filter( 'bbp_pre_has_replies_query', array( $this, 'display_topic_query' ) );
+
+            // Output template
             bbp_get_template_part( 'bbpress/content', 'single-topic' );
 
         // Forum is private and user does not have caps
         } elseif ( bbp_is_forum_private( $forum_id, false ) ) {
-            bbp_get_template_part( 'bbpress/feedback', 'no-access' );
+            bbp_get_template_part( 'bbpress/feedback', 'no-access'    );
         }
 
@@ -446 +433 @@
 
         // Set passed attribute to $reply_id for clarity
-        $reply_id = $attr['id'];
+        $bbp->current_reply_id = $reply_id = $attr['id'];
         $forum_id = bbp_get_reply_forum_id( $reply_id );
 
@@ -548 +535 @@
      */
     public function display_topics_of_tag( $attr, $content = '' ) {
+        global $bbp;
 
         // Sanity check required info
@@ -553 +541 @@
             return $content;
 
+        // Unset globals
+        $this->unset_globals();
+
+        // Start output buffer
+        $this->start( 'bbp_topics_of_tag' );
+
         // Set passed attribute to $ag_id for clarity
-        $tag_id = $attr['id'];
-
-        // Setup tax query
-        $args = array( 'tax_query' => array( array(
-            'taxonomy' => bbp_get_topic_tag_tax_id(),
-            'field'    => 'id',
-            'terms'    => $tag_id
-        ) ) );
-
-        // Unset globals
-        $this->unset_globals();
-
-        // Start output buffer
-        $this->start( 'bbp_topics_of_tag' );
-
-        // Load the topics
-        bbp_has_topics( $args );
+        $bbp->current_topic_tag_id = $tag_id = $attr['id'];
+
+        // Filter the query
+        add_filter( 'bbp_pre_has_topics_query', array( $this, 'display_topics_of_tag_query' ) );
 
         // Output template
@@ -745 +726 @@
         // Return contents of output buffer
         return $this->end();
+    }
+
+    /** Query Filters *********************************************************/
+
+    /**
+     * Filter the query for the topic index
+     *
+     * @since bbPress (rxxxx)
+     *
+     * @param array $args
+     * @return array
+     */
+    public function display_topic_index_query( $args = array() ) {
+        $args['author']        = 0;
+        $args['show_stickies'] = true;
+        $args['order']         = 'DESC';
+        return $args;
+    }
+
+    /**
+     * Filter the query for the topic index
+     *
+     * @since bbPress (rxxxx)
+     *
+     * @param array $args
+     * @return array
+     */
+    public function display_topic_query( $args = array() ) {
+        global $bbp;
+
+        $args['meta_query'] = array( array(
+            'key'     => '_bbp_topic_id',
+            'value'   => $bbp->current_topic_id,
+            'compare' => '='
+        ) );
+
+        return $args;
+    }
+
+    /**
+     * Filter the query for topic tags
+     *
+     * @since bbPress (r3637)
+     *
+     * @global bbPress $bbp
+     * @param array $args
+     * @return array
+     */
+    public function display_topics_of_tag_query( $args = array() ) {
+        global $bbp;
+
+        $args['tax_query'] = array( array(
+            'taxonomy' => bbp_get_topic_tag_tax_id(),
+            'field'    => 'id',
+            'terms'    => $bbp->current_topic_tag_id
+        ) );
+
+        return $args;
     }
 }

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

@@ -76 +76 @@
 
     // Default arguments
-    $default = array (
+    $default = array(
 
         // Narrow query down to bbPress topics
@@ -111 +111 @@
         'post_status'    => $default_status,
     );
+
+    // Maybe query for topic tags
+    if ( !bbp_is_query_name( 'bbp_widget' ) && bbp_is_topic_tag() ) {
+        $default['term']     = bbp_get_topic_tag_slug();
+        $default['taxonomy'] = bbp_get_topic_tag_tax_id();
+    }
 
     // Filter the default arguments

branches/plugin/bbp-themes/bbp-twentyten/css/bbpress.css

@@ -631 +631 @@
 -------------------------------------------------------------- */
 
-.bbp-topics-front tr.super-sticky td,
-.bbp-topics tr.super-sticky td,
-.bbp-topics tr.sticky td,
-.bbp-forum-content tr.sticky td {
+.bbp-topics-front ul.super-sticky,
+.bbp-topics ul.super-sticky,
+.bbp-topics ul.sticky,
+.bbp-forum-content ul.sticky {
     background-color: #ffffe0 !important;
     font-size: 1.1em;

branches/plugin/bbpress.php

@@ -231 +231 @@
      */
     public $current_reply_id = 0;
+
+    /**
+     * @var string Current topic tag id
+     */
+    public $current_topic_tag_id = 0;
 
     /** Users *****************************************************************/