Changeset 3571

Timestamp:

11/02/2011 06:21:14 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Use get_post_class() to fix premature echo of forum/topic/reply post classes. See #1650, r3543. (2.1)

Location:

branches/plugin/bbp-includes

Files:

• bbp-forum-template.php (modified) (2 diffs)
• bbp-reply-template.php (modified) (2 diffs)
• bbp-topic-template.php (modified) (2 diffs)

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

@@ -1613 +1613 @@
  * @since bbPress (r2667)
  *
+ * @param int $forum_id Optional. Forum ID.
  * @uses bbp_get_forum_class() To get the row class of the forum
  */
-function bbp_forum_class() {
-    echo bbp_get_forum_class();
+function bbp_forum_class( $forum_id = 0 ) {
+    echo bbp_get_forum_class( $forum_id );
 }
     /**
@@ -1623 +1624 @@
      * @since bbPress (r2667)
      *
-     * @uses post_class() To get all the classes including ours
+     * @param int $forum_id Optional. Forum ID
+     * @uses get_post_class() To get all the classes including ours
      * @uses apply_filters() Calls 'bbp_get_forum_class' with the classes
      * @return string Row class of the forum
      */
-    function bbp_get_forum_class() {
+    function bbp_get_forum_class( $forum_id = 0 ) {
         global $bbp;
 
+        $forum_id  = bbp_get_forum_id( $forum_id );
+        $count     = isset( $bbp->forum_query->current_post ) ? $bbp->forum_query->current_post : 1;
         $classes   = array();
-        $classes[] = $bbp->forum_query->current_post % 2 ? 'even' : 'odd';
-        $classes[] = bbp_is_forum_category() ? 'status-category' : '';
-        $classes[] = bbp_is_forum_private()  ? 'status-private'  : '';
+        $classes[] = ( (int) $count % 2 )               ? 'even'            : 'odd';
+        $classes[] = bbp_is_forum_category( $forum_id ) ? 'status-category' : '';
+        $classes[] = bbp_is_forum_private( $forum_id )  ? 'status-private'  : '';
         $classes   = array_filter( $classes );
-
-        $post      = post_class( $classes );
-
-        return apply_filters( 'bbp_get_forum_class', $post );
+        $retval    = get_post_class( $classes, $forum_id );
+        $retval    = 'class="' . join( ' ', $retval ) . '"';
+
+        return apply_filters( 'bbp_get_forum_class', $retval, $forum_id );
     }
 

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

@@ -1705 +1705 @@
  *
  * @since bbPress (r2678)
- */
-function bbp_reply_class() {
-    echo bbp_get_reply_class();
+ *
+ * @param int $reply_id Optional. Reply ID
+ * @uses bbp_get_reply_class() To get the reply class
+ */
+function bbp_reply_class( $reply_id = 0 ) {
+    echo bbp_get_reply_class( $reply_id );
 }
     /**
@@ -1714 +1717 @@
      * @since bbPress (r2678)
      *
-     * @uses post_class() To get all the classes including ours
+     * @param int $reply_id Optional. Reply ID
+     * @uses get_post_class() To get all the classes including ours
      * @uses apply_filters() Calls 'bbp_get_reply_class' with the classes
      * @return string Row class of the reply
      */
-    function bbp_get_reply_class() {
+    function bbp_get_reply_class( $reply_id = 0 ) {
         global $bbp;
 
+        $reply_id  = bbp_get_reply_id( $reply_id );
         $count     = isset( $bbp->reply_query->current_post ) ? $bbp->reply_query->current_post : 1;
-        $alternate = (int) $count % 2 ? 'even' : 'odd';
-        $post      = post_class( array( $alternate ) );
-
-        return apply_filters( 'bbp_reply_class', $post );
+        $classes   = array();
+        $classes[] = ( (int) $count % 2 ) ? 'even' : 'odd';
+        $retval    = get_post_class( $classes, $reply_id );
+        $retval    = 'class="' . join( ' ', $retval ) . '"';
+
+        return apply_filters( 'bbp_get_reply_class', $retval, $reply_id );
     }
 

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

@@ -1931 +1931 @@
      * @uses bbp_is_topic_super_sticky() To check if the topic is a super
      *                                    sticky
-     * @uses post_class() To get the topic classes
+     * @uses get_post_class() To get the topic classes
      * @uses apply_filters() Calls 'bbp_get_topic_class' with the classes
      *                        and topic id
@@ -1939 +1939 @@
         global $bbp;
 
+        $topic_id  = bbp_get_topic_id( $topic_id );
+        $count     = isset( $bbp->topic_query->current_post ) ? $bbp->topic_query->current_post : 1;
         $classes   = array();
-        $classes[] = $bbp->topic_query->current_post % 2     ? 'even'         : 'odd';
+        $classes[] = ( (int) $count % 2 )                    ? 'even'         : 'odd';
         $classes[] = bbp_is_topic_sticky( $topic_id, false ) ? 'sticky'       : '';
         $classes[] = bbp_is_topic_super_sticky( $topic_id  ) ? 'super-sticky' : '';
         $classes   = array_filter( $classes );
-        $post      = post_class( $classes, $topic_id );
-
-        return apply_filters( 'bbp_get_topic_class', $post, $topic_id );
+        $retval    = get_post_class( $classes, $topic_id );
+        $retval    = 'class="' . join( ' ', $retval ) . '"';
+
+        return apply_filters( 'bbp_get_topic_class', $retval, $topic_id );
     }