Changeset 5732

Timestamp:

05/12/2015 10:27:33 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Bumps: Normalize type-casting in bump functions.

Props thebrandonallen, netweb. See #2801.

Location:

trunk/src/includes

Files:

• forums/functions.php (modified) (5 diffs)
• topics/functions.php (modified) (2 diffs)
• users/functions.php (modified) (4 diffs)

trunk/src/includes/forums/functions.php

@@ -1051 +1051 @@
 function bbp_bump_forum_topic_count( $forum_id = 0, $difference = 1, $update_ancestors = true ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Get some counts
     $forum_id          = bbp_get_forum_id( $forum_id );
     $topic_count       = bbp_get_forum_topic_count( $forum_id, false, true );
     $total_topic_count = bbp_get_forum_topic_count( $forum_id, true,  true );
+    $difference        = (int) $difference;
 
     // Update this forum id
-    update_post_meta( $forum_id, '_bbp_topic_count',       (int) $topic_count       + (int) $difference );
-    update_post_meta( $forum_id, '_bbp_total_topic_count', (int) $total_topic_count + (int) $difference );
+    update_post_meta( $forum_id, '_bbp_topic_count',       (int) ( $topic_count       + $difference ) );
+    update_post_meta( $forum_id, '_bbp_total_topic_count', (int) ( $total_topic_count + $difference ) );
 
     // Check for ancestors
@@ -1076 +1082 @@
 
                 // Update counts
-                update_post_meta( $parent_forum_id, '_bbp_topic_count',       (int) $parent_topic_count       + (int) $difference );
-                update_post_meta( $parent_forum_id, '_bbp_total_topic_count', (int) $parent_total_topic_count + (int) $difference );
+                update_post_meta( $parent_forum_id, '_bbp_topic_count',       (int) ( $parent_topic_count       + $difference ) );
+                update_post_meta( $parent_forum_id, '_bbp_total_topic_count', (int) ( $parent_total_topic_count + $difference ) );
             }
         }
     }
 
-    return (int) apply_filters( 'bbp_bump_forum_topic_count', (int) $total_topic_count + (int) $difference, $forum_id, (int) $difference, (bool) $update_ancestors );
+    $forum_topic_count = (int) ( $total_topic_count + $difference );
+
+    return (int) apply_filters( 'bbp_bump_forum_topic_count', $forum_topic_count, $forum_id, $difference, $update_ancestors );
 }
 
@@ -1101 +1109 @@
 function bbp_bump_forum_topic_count_hidden( $forum_id = 0, $difference = 1 ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Get some counts
     $forum_id    = bbp_get_forum_id( $forum_id );
     $topic_count = bbp_get_forum_topic_count_hidden( $forum_id, true );
-    $new_count   = (int) $topic_count + (int) $difference;
+    $difference  = (int) $difference;
+    $new_count   = (int) ( $topic_count + $difference );
 
     // Update this forum id
-    update_post_meta( $forum_id, '_bbp_topic_count_hidden', (int) $new_count );
-
-    return (int) apply_filters( 'bbp_bump_forum_topic_count_hidden', (int) $new_count, $forum_id, (int) $difference );
+    update_post_meta( $forum_id, '_bbp_topic_count_hidden', $new_count );
+
+    return (int) apply_filters( 'bbp_bump_forum_topic_count_hidden', $new_count, $forum_id, $difference );
 }
 
@@ -1128 +1142 @@
 function bbp_bump_forum_reply_count( $forum_id = 0, $difference = 1, $update_ancestors = true ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Get some counts
     $forum_id          = bbp_get_forum_id( $forum_id );
     $topic_count       = bbp_get_forum_reply_count( $forum_id, false, true );
     $total_reply_count = bbp_get_forum_reply_count( $forum_id, true,  true );
+    $difference        = (int) $difference;
 
     // Update this forum id
-    update_post_meta( $forum_id, '_bbp_reply_count',       (int) $topic_count       + (int) $difference );
-    update_post_meta( $forum_id, '_bbp_total_reply_count', (int) $total_reply_count + (int) $difference );
+    update_post_meta( $forum_id, '_bbp_reply_count',       (int) ( $topic_count       + $difference ) );
+    update_post_meta( $forum_id, '_bbp_total_reply_count', (int) ( $total_reply_count + $difference ) );
 
     // Check for ancestors
@@ -1153 +1173 @@
 
                 // Update counts
-                update_post_meta( $parent_forum_id, '_bbp_reply_count',       (int) $parent_topic_count       + (int) $difference );
-                update_post_meta( $parent_forum_id, '_bbp_total_reply_count', (int) $parent_total_reply_count + (int) $difference );
+                update_post_meta( $parent_forum_id, '_bbp_reply_count',       (int) ( $parent_topic_count       + $difference ) );
+                update_post_meta( $parent_forum_id, '_bbp_total_reply_count', (int) ( $parent_total_reply_count + $difference ) );
             }
         }
     }
 
-    return (int) apply_filters( 'bbp_bump_forum_reply_count', (int) $total_reply_count + (int) $difference, $forum_id, (int) $difference, (bool) $update_ancestors );
+    $forum_reply_count = (int) ( $total_reply_count + $difference );
+
+    return (int) apply_filters( 'bbp_bump_forum_reply_count', $forum_reply_count, $forum_id, $difference, $update_ancestors );
 }
 

trunk/src/includes/topics/functions.php

@@ -2336 +2336 @@
 function bbp_bump_topic_reply_count( $topic_id = 0, $difference = 1 ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Get counts
     $topic_id    = bbp_get_topic_id( $topic_id );
     $reply_count = bbp_get_topic_reply_count( $topic_id, true );
-    $new_count   = (int) $reply_count + (int) $difference;
+    $difference  = (int) $difference;
+    $new_count   = (int) ( $reply_count + $difference );
 
     // Update this topic id's reply count
-    update_post_meta( $topic_id, '_bbp_reply_count', (int) $new_count );
-
-    return (int) apply_filters( 'bbp_bump_topic_reply_count', (int) $new_count, $topic_id, (int) $difference );
+    update_post_meta( $topic_id, '_bbp_reply_count', $new_count );
+
+    return (int) apply_filters( 'bbp_bump_topic_reply_count', $new_count, $topic_id, $difference );
 }
 
@@ -2363 +2369 @@
 function bbp_bump_topic_reply_count_hidden( $topic_id = 0, $difference = 1 ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Get counts
     $topic_id    = bbp_get_topic_id( $topic_id );
     $reply_count = bbp_get_topic_reply_count_hidden( $topic_id, true );
-    $new_count   = (int) $reply_count + (int) $difference;
+    $difference  = (int) $difference;
+    $new_count   = (int) ( $reply_count + $difference );
 
     // Update this topic id's hidder reply count
-    update_post_meta( $topic_id, '_bbp_reply_count_hidden', (int) $new_count );
-
-    return (int) apply_filters( 'bbp_bump_topic_reply_count_hidden', (int) $new_count, $topic_id, (int) $difference );
+    update_post_meta( $topic_id, '_bbp_reply_count_hidden', $new_count );
+
+    return (int) apply_filters( 'bbp_bump_topic_reply_count_hidden', $new_count, $topic_id, $difference );
 }
 

trunk/src/includes/users/functions.php

@@ -1787 +1787 @@
 function bbp_bump_user_topic_count( $user_id = 0, $difference = 1 ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Validate user ID
     $user_id = bbp_get_user_id( $user_id );
@@ -1799 +1804 @@
     }
 
+    $difference       = (int) $difference;
+    $user_topic_count = (int) ( $count + $difference );
+
     // Add them up and filter them
-    $new_count = apply_filters( 'bbp_bump_user_topic_count', ( (int) $count + (int) $difference ), $user_id, $difference, $count );
+    $new_count = (int) apply_filters( 'bbp_bump_user_topic_count', $user_topic_count, $user_id, $difference, $count );
 
     return bbp_update_user_topic_count( $user_id, $new_count );
@@ -1817 +1825 @@
 function bbp_bump_user_reply_count( $user_id = 0, $difference = 1 ) {
 
+    // Bail if no bump
+    if ( empty( $difference ) ) {
+        return false;
+    }
+
     // Validate user ID
     $user_id = bbp_get_user_id( $user_id );
@@ -1828 +1841 @@
         $count = bbp_get_user_reply_count_raw( $user_id );
     }
+
+    $difference       = (int) $difference;
+    $user_reply_count = (int) ( $count + $difference );
 
     // Add them up and filter them