Changeset 6296

Timestamp:

02/21/2017 06:19:56 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Meta: Filter _count_int and enforce integer values.

Also use convenience functions for forum post counts, to ensure proper filters are ran against all meta values.

See #3059.

Location:

trunk/src/includes

Files:

• core/filters.php (modified) (2 diffs)
• forums/template.php (modified) (2 diffs)

trunk/src/includes/core/filters.php

@@ -191 +191 @@
 add_filter( 'bbp_get_form_reply_to',          'absint'   );
 
-// Add number format filter to functions requiring numeric output
+// Add number format filter to functions requesting formatted values
 add_filter( 'bbp_get_user_topic_count',         'bbp_number_format', 10 );
 add_filter( 'bbp_get_user_reply_count',         'bbp_number_format', 10 );
@@ -202 +202 @@
 add_filter( 'bbp_get_topic_reply_count',        'bbp_number_format', 10 );
 add_filter( 'bbp_get_topic_post_count',         'bbp_number_format', 10 );
+add_filter( 'bbp_get_topic_revision_count',     'bbp_number_format', 10 );
+add_filter( 'bbp_get_reply_revision_count',     'bbp_number_format', 10 );
 add_filter( 'bbp_get_forum_topic_count_hidden', 'bbp_number_format', 10 );
 add_filter( 'bbp_get_topic_reply_count_hidden', 'bbp_number_format', 10 );
+
+// Add absint filter to functions expecting absolute values
+add_filter( 'bbp_get_user_topic_count_int',         'intval', 10 );
+add_filter( 'bbp_get_user_reply_count_int',         'absint', 10 );
+add_filter( 'bbp_get_user_post_count_int',          'absint', 10 );
+add_filter( 'bbp_get_forum_subforum_count_int',     'absint', 10 );
+add_filter( 'bbp_get_forum_topic_count_int',        'absint', 10 );
+add_filter( 'bbp_get_forum_reply_count_int',        'absint', 10 );
+add_filter( 'bbp_get_forum_post_count_int',         'absint', 10 );
+add_filter( 'bbp_get_topic_voice_count_int',        'absint', 10 );
+add_filter( 'bbp_get_topic_reply_count_int',        'absint', 10 );
+add_filter( 'bbp_get_topic_post_count_int',         'absint', 10 );
+add_filter( 'bbp_get_forum_topic_count_hidden_int', 'absint', 10 );
+add_filter( 'bbp_get_topic_reply_count_hidden_int', 'absint', 10 );
 
 // Sanitize displayed user data

trunk/src/includes/forums/template.php

@@ -1429 +1429 @@
      * @param boolean $integer Optional. Whether or not to format the result
      * @uses bbp_get_forum_id() To get the forum id
-     * @uses get_post_meta() To get the forum post count
+     * @uses bbp_get_forum_topic_count() To get the topic count
+     * @uses bbp_get_forum_reply_count() To get the reply count
      * @uses apply_filters() Calls 'bbp_get_forum_post_count' with the
      *                        post count and forum id
@@ -1437 +1438 @@
         $forum_id = bbp_get_forum_id( $forum_id );
         $topics   = bbp_get_forum_topic_count( $forum_id, $total_count, true );
-        $meta_key = empty( $total_count ) ? '_bbp_reply_count' : '_bbp_total_reply_count';
-        $replies  = (int) get_post_meta( $forum_id, $meta_key, true );
+        $replies  = bbp_get_forum_reply_count( $forum_id, $total_count, true );
         $retval   = $replies + $topics;
-        $filter   = ( true === $integer ) ? 'bbp_get_forum_post_count_int' : 'bbp_get_forum_post_count';
+        $filter   = ( true === $integer )
+                ? 'bbp_get_forum_post_count_int'
+                : 'bbp_get_forum_post_count';
 
         return apply_filters( $filter, $retval, $forum_id );