Changeset 4258 for trunk/bbp-includes/topics/template-tags.php

Timestamp:

10/19/2012 07:42:49 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Number Formatting:

• Introduce $integer parameter to template-tags to switch filter for integer usage.
• Use absint() where appropriate when getting counts.
• Smarter int type casting.
• Fixes bug where calculations were being done against formatted strings.
• Fixes #1974.

File:

• trunk/bbp-includes/topics/template-tags.php (modified) (14 diffs)

trunk/bbp-includes/topics/template-tags.php

@@ -737 +737 @@
 
         // Get total and add 1 if topic is included in the reply loop
-        $total = bbp_get_topic_reply_count( $topic_id );
+        $total = bbp_get_topic_reply_count( $topic_id, true );
 
         // Bump if topic is in loop
@@ -918 +918 @@
  * @return string Topic revision count
  */
-function bbp_get_topic_revision_count( $topic_id = 0 ) {
-    return apply_filters( 'bbp_get_topic_revisions', count( bbp_get_topic_revisions( $topic_id ) ), $topic_id );
+function bbp_get_topic_revision_count( $topic_id = 0, $integer = false ) {
+    $count  = absint( 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 );
 }
 
@@ -1855 +1858 @@
         $topic    = bbp_get_topic( bbp_get_topic_id( (int) $topic_id ) );
         $topic_id = $topic->ID;
-        $replies  = bbp_get_topic_reply_count( $topic_id );
-        $replies  = sprintf( _n( '%s reply', '%s replies', $replies, 'bbpress' ), $replies );
+        $replies  = sprintf( _n( '%s reply', '%s replies', bbp_get_topic_reply_count( $topic_id, true ), 'bbpress' ), bbp_get_topic_reply_count( $topic_id ) );
         $retval   = '';
 
@@ -1893 +1895 @@
  *
  * @param int $topic_id Optional. Topic id
+ * @param boolean $integer Optional. Whether or not to format the result
  * @uses bbp_get_topic_reply_count() To get the topic reply count
  */
-function bbp_topic_reply_count( $topic_id = 0 ) {
-    echo bbp_get_topic_reply_count( $topic_id );
+function bbp_topic_reply_count( $topic_id = 0, $integer = false ) {
+    echo bbp_get_topic_reply_count( $topic_id, $integer );
 }
     /**
@@ -1904 +1907 @@
      *
      * @param int $topic_id Optional. Topic id
+     * @param boolean $integer Optional. Whether or not to format the result
      * @uses bbp_get_topic_id() To get the topic id
      * @uses get_post_meta() To get the topic reply count meta
@@ -1910 +1914 @@
      * @return int Reply count
      */
-    function bbp_get_topic_reply_count( $topic_id = 0 ) {
+    function bbp_get_topic_reply_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count', true );
-
-        return apply_filters( 'bbp_get_topic_reply_count', (int) $replies, $topic_id );
+        $replies  = absint( 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 );
     }
 
@@ -1923 +1928 @@
  *
  * @param int $topic_id Optional. Topic id
+ * @param boolean $integer Optional. Whether or not to format the result
  * @uses bbp_get_topic_post_count() To get the topic post count
  */
-function bbp_topic_post_count( $topic_id = 0 ) {
-    echo bbp_get_topic_post_count( $topic_id );
+function bbp_topic_post_count( $topic_id = 0, $integer = false ) {
+    echo bbp_get_topic_post_count( $topic_id, $integer );
 }
     /**
@@ -1934 +1940 @@
      *
      * @param int $topic_id Optional. Topic id
+     * @param boolean $integer Optional. Whether or not to format the result
      * @uses bbp_get_topic_id() To get the topic id
      * @uses get_post_meta() To get the topic post count meta
@@ -1940 +1947 @@
      * @return int Post count
      */
-    function bbp_get_topic_post_count( $topic_id = 0 ) {
+    function bbp_get_topic_post_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count', true );
-
-        return apply_filters( 'bbp_get_topic_post_count', (int) $replies + 1, $topic_id );
+        $replies  = absint( 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 );
     }
 
@@ -1954 +1962 @@
  *
  * @param int $topic_id Optional. Topic id
+ * @param boolean $integer Optional. Whether or not to format the result
  * @uses bbp_get_topic_reply_count_hidden() To get the topic hidden reply count
  */
-function bbp_topic_reply_count_hidden( $topic_id = 0 ) {
-    echo bbp_get_topic_reply_count_hidden( $topic_id );
+function bbp_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
+    echo bbp_get_topic_reply_count_hidden( $topic_id, $integer );
 }
     /**
@@ -1966 +1975 @@
      *
      * @param int $topic_id Optional. Topic id
+     * @param boolean $integer Optional. Whether or not to format the result
      * @uses bbp_get_topic_id() To get the topic id
      * @uses get_post_meta() To get the hidden reply count
@@ -1972 +1982 @@
      * @return int Topic hidden reply count
      */
-    function bbp_get_topic_reply_count_hidden( $topic_id = 0 ) {
+    function bbp_get_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $replies  = get_post_meta( $topic_id, '_bbp_reply_count_hidden', true );
-
-        return (int) apply_filters( 'bbp_get_topic_reply_count_hidden', (int) $replies, $topic_id );
+        $replies  = absint( 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 );
     }
 
@@ -1987 +1998 @@
  * @uses bbp_get_topic_voice_count() To get the topic voice count
  */
-function bbp_topic_voice_count( $topic_id = 0 ) {
-    echo bbp_get_topic_voice_count( $topic_id );
+function bbp_topic_voice_count( $topic_id = 0, $integer = false ) {
+    echo bbp_get_topic_voice_count( $topic_id, $integer );
 }
     /**
@@ -2002 +2013 @@
      * @return int Voice count of the topic
      */
-    function bbp_get_topic_voice_count( $topic_id = 0 ) {
+    function bbp_get_topic_voice_count( $topic_id = 0, $integer = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        $voices   = get_post_meta( $topic_id, '_bbp_voice_count', true );
-
-        return apply_filters( 'bbp_get_topic_voice_count', (int) $voices, $topic_id );
+        $voices   = absint( 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 );
     }