Changeset 6302 for trunk/src/includes/topics/template.php

Timestamp:

02/23/2017 11:24:29 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Common: Introduce bbp_number_not_negative() and use it in the following ways:

• Register the relevant meta-data keys for posts & users, so updated values can never be invalid
• Filter return values for existing database values that might be invalid on existing installs
• Use in place of intval() or (int) casts where negative values should not exist

This has the added benefit of introducing the bbp_register_meta hook, for future meta-data registrations (of which bbPress has much of.) We'll concentrate on counts for 2.6, and integrate IDs and timestamps in future releases.

See #3059.

File:

• trunk/src/includes/topics/template.php (modified) (5 diffs)

trunk/src/includes/topics/template.php

@@ -1070 +1070 @@
  */
 function bbp_get_topic_revision_count( $topic_id = 0, $integer = false ) {
-    $count  = (int) count( bbp_get_topic_revisions( $topic_id ) );
-    $filter = ( true === $integer ) ? 'bbp_get_topic_revision_count_int' : 'bbp_get_topic_revision_count';
+    $topic_id = bbp_get_topic_id( $topic_id );
+    $count    = bbp_number_not_negative( count( bbp_get_topic_revisions( $topic_id ) ) );
+    $filter   = ( true === $integer )
+        ? 'bbp_get_topic_revision_count_int'
+        : 'bbp_get_topic_revision_count';
 
     return apply_filters( $filter, $count, $topic_id );
@@ -2258 +2261 @@
     function bbp_get_topic_reply_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = (int) get_post_meta( $topic_id, '_bbp_reply_count', true );
-        $filter   = ( true === $integer ) ? 'bbp_get_topic_reply_count_int' : 'bbp_get_topic_reply_count';
+        $replies  = bbp_number_not_negative( get_post_meta( $topic_id, '_bbp_reply_count', true ) );
+        $filter   = ( true === $integer )
+            ? 'bbp_get_topic_reply_count_int'
+            : 'bbp_get_topic_reply_count';
 
         return apply_filters( $filter, $replies, $topic_id );
@@ -2291 +2296 @@
     function bbp_get_topic_post_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = (int) get_post_meta( $topic_id, '_bbp_reply_count', true ) + 1;
-        $filter   = ( true === $integer ) ? 'bbp_get_topic_post_count_int' : 'bbp_get_topic_post_count';
+        $replies  = bbp_number_not_negative( get_post_meta( $topic_id, '_bbp_reply_count', true ) + 1 );
+        $filter   = ( true === $integer )
+            ? 'bbp_get_topic_post_count_int'
+            : 'bbp_get_topic_post_count';
 
         return apply_filters( $filter, $replies, $topic_id );
@@ -2326 +2333 @@
     function bbp_get_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = (int) get_post_meta( $topic_id, '_bbp_reply_count_hidden', true );
-        $filter   = ( true === $integer ) ? 'bbp_get_topic_reply_count_hidden_int' : 'bbp_get_topic_reply_count_hidden';
+        $replies  = bbp_number_not_negative( get_post_meta( $topic_id, '_bbp_reply_count_hidden', true ) );
+        $filter   = ( true === $integer )
+            ? 'bbp_get_topic_reply_count_hidden_int'
+            : 'bbp_get_topic_reply_count_hidden';
 
         return apply_filters( $filter, $replies, $topic_id );
@@ -2357 +2366 @@
     function bbp_get_topic_voice_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $voices   = (int) get_post_meta( $topic_id, '_bbp_voice_count', true );
-        $filter   = ( true === $integer ) ? 'bbp_get_topic_voice_count_int' : 'bbp_get_topic_voice_count';
+        $voices   = bbp_number_not_negative( get_post_meta( $topic_id, '_bbp_voice_count', true ) );
+        $filter   = ( true === $integer )
+            ? 'bbp_get_topic_voice_count_int'
+            : 'bbp_get_topic_voice_count';
 
         return apply_filters( $filter, $voices, $topic_id );