Changeset 4331

Timestamp:

11/04/2012 04:22:18 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Code Improvement:

• Revert part of r4258.
• Cast as int instead of using absint()
• Fixes regression that broke existing bbPress plugin (hierarchical replies.)
• Fixes #2008.

Location:

trunk/includes

Files:

• extend/buddypress.php (modified) (1 diff)
• forums/template-tags.php (modified) (5 diffs)
• replies/functions.php (modified) (2 diffs)
• replies/template-tags.php (modified) (1 diff)
• topics/functions.php (modified) (2 diffs)
• topics/template-tags.php (modified) (5 diffs)
• users/options.php (modified) (3 diffs)

trunk/includes/extend/buddypress.php

@@ -393 +393 @@
 
                 // Try to get the activity ID of the post
-                $activity_id = absint( get_post_meta( $post_id, '_bbp_activity_id', true ) );
+                $activity_id = (int) get_post_meta( $post_id, '_bbp_activity_id', true );
 
                 // Bail if no activity ID is in post meta

trunk/includes/forums/template-tags.php

@@ -1177 +1177 @@
         function bbp_get_forum_subforum_count( $forum_id = 0, $integer = false ) {
                 $forum_id    = bbp_get_forum_id( $forum_id );
-                $forum_count = absint( get_post_meta( $forum_id, '_bbp_forum_subforum_count', true ) );
+                $forum_count = (int) get_post_meta( $forum_id, '_bbp_forum_subforum_count', true );
                 $filter      = ( true === $integer ) ? 'bbp_get_forum_subforum_count_int' : 'bbp_get_forum_subforum_count';
 
@@ -1214 +1214 @@
                 $forum_id = bbp_get_forum_id( $forum_id );
                 $meta_key = empty( $total_count ) ? '_bbp_topic_count' : '_bbp_total_topic_count';
-                $topics   = absint( get_post_meta( $forum_id, $meta_key, true ) );
+                $topics   = (int) get_post_meta( $forum_id, $meta_key, true );
                 $filter   = ( true === $integer ) ? 'bbp_get_forum_topic_count_int' : 'bbp_get_forum_topic_count';
 
@@ -1251 +1251 @@
                 $forum_id = bbp_get_forum_id( $forum_id );
                 $meta_key = empty( $total_count ) ? '_bbp_reply_count' : '_bbp_total_reply_count';
-                $replies  = absint( get_post_meta( $forum_id, $meta_key, true ) );
+                $replies  = (int) get_post_meta( $forum_id, $meta_key, true );
                 $filter   = ( true === $integer ) ? 'bbp_get_forum_reply_count_int' : 'bbp_get_forum_reply_count';
 
@@ -1289 +1289 @@
                 $topics   = bbp_get_forum_topic_count( $forum_id, $total_count, true );
                 $meta_key = empty( $total_count ) ? '_bbp_reply_count' : '_bbp_total_reply_count';
-                $replies  = absint( get_post_meta( $forum_id, $meta_key, true ) );
+                $replies  = (int) get_post_meta( $forum_id, $meta_key, true );
                 $retval   = $replies + $topics;
                 $filter   = ( true === $integer ) ? 'bbp_get_forum_post_count_int' : 'bbp_get_forum_post_count';
@@ -1325 +1325 @@
         function bbp_get_forum_topic_count_hidden( $forum_id = 0, $integer = false ) {
                 $forum_id = bbp_get_forum_id( $forum_id );
-                $topics   = absint( get_post_meta( $forum_id, '_bbp_topic_count_hidden', true ) );
+                $topics   = (int) get_post_meta( $forum_id, '_bbp_topic_count_hidden', true );
                 $filter   = ( true === $integer ) ? 'bbp_get_forum_topic_count_hidden_int' : 'bbp_get_forum_topic_count_hidden';
 

trunk/includes/replies/functions.php

@@ -1363 +1363 @@
 
         // Filter and return
-        return absint( apply_filters( 'bbp_get_replies_per_page', $retval, $default ) );
+        return (int) apply_filters( 'bbp_get_replies_per_page', $retval, $default );
 }
 
@@ -1386 +1386 @@
 
         // Filter and return
-        return absint( apply_filters( 'bbp_get_replies_per_rss_page', $retval, $default ) );
+        return (int) apply_filters( 'bbp_get_replies_per_rss_page', $retval, $default );
 }
 

trunk/includes/replies/template-tags.php

@@ -698 +698 @@
  */
 function bbp_get_reply_revision_count( $reply_id = 0, $integer = false ) {
-        $count = absint( count( bbp_get_reply_revisions( $reply_id ) ) );
+        $count  = (int) count( bbp_get_reply_revisions( $reply_id ) );
         $filter = ( true === $integer ) ? 'bbp_get_reply_revision_count_int' : 'bbp_get_reply_revision_count';
 

trunk/includes/topics/functions.php

@@ -3070 +3070 @@
 
         // Filter and return
-        return absint( apply_filters( 'bbp_get_topics_per_page', $retval, $default ) );
+        return (int) apply_filters( 'bbp_get_topics_per_page', $retval, $default );
 }
 
@@ -3093 +3093 @@
 
         // Filter and return
-        return absint( apply_filters( 'bbp_get_topics_per_rss_page', $retval, $default ) );
+        return (int) apply_filters( 'bbp_get_topics_per_rss_page', $retval, $default );
 }
 

trunk/includes/topics/template-tags.php

@@ -927 +927 @@
  */
 function bbp_get_topic_revision_count( $topic_id = 0, $integer = false ) {
-        $count  = absint( count( bbp_get_topic_revisions( $topic_id ) ) );
+        $count  = (int) count( bbp_get_topic_revisions( $topic_id ) );
         $filter = ( true === $integer ) ? 'bbp_get_topic_revision_count_int' : 'bbp_get_topic_revision_count';
 
@@ -1924 +1924 @@
         function bbp_get_topic_reply_count( $topic_id = 0, $integer = false ) {
                 $topic_id = bbp_get_topic_id( $topic_id );
-                $replies  = absint( get_post_meta( $topic_id, '_bbp_reply_count', true ) );
+                $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';
 
@@ -1957 +1957 @@
         function bbp_get_topic_post_count( $topic_id = 0, $integer = false ) {
                 $topic_id = bbp_get_topic_id( $topic_id );
-                $replies  = absint( get_post_meta( $topic_id, '_bbp_reply_count', true ) ) + 1;
+                $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';
 
@@ -1992 +1992 @@
         function bbp_get_topic_reply_count_hidden( $topic_id = 0, $integer = false ) {
                 $topic_id = bbp_get_topic_id( $topic_id );
-                $replies  = absint( get_post_meta( $topic_id, '_bbp_reply_count_hidden', true ) );
+                $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';
 
@@ -2023 +2023 @@
         function bbp_get_topic_voice_count( $topic_id = 0, $integer = false ) {
                 $topic_id = bbp_get_topic_id( $topic_id );
-                $voices   = absint( get_post_meta( $topic_id, '_bbp_voice_count', true ) );
+                $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';
 

trunk/includes/users/options.php

@@ -152 +152 @@
                         return false;
 
-                $count  = absint( get_user_option( '_bbp_topic_count', $user_id ) );
+                $count  = (int) get_user_option( '_bbp_topic_count', $user_id );
                 $filter = ( false == $integer ) ? 'bbp_get_user_topic_count_int' : 'bbp_get_user_topic_count';
 
@@ -190 +190 @@
                         return false;
 
-                $count  = absint( get_user_option( '_bbp_reply_count', $user_id ) );
+                $count  = (int) get_user_option( '_bbp_reply_count', $user_id );
                 $filter = ( true == $integer ) ? 'bbp_get_user_topic_count_int' : 'bbp_get_user_topic_count';
 
@@ -230 +230 @@
                 $topics  = bbp_get_user_topic_count( $user_id, true );
                 $replies = bbp_get_user_reply_count( $user_id, true );
-                $count   = absint( $topics + $replies );
+                $count   = (int) $topics + $replies;
                 $filter  = ( true == $integer ) ? 'bbp_get_user_post_count_int' : 'bbp_get_user_post_count';