Ticket #2801: 2801.02.patch

src/includes/common/functions.php

@@ -1528 +1528 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
 
-                $child_id = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", $parent_id, $post_type ) );
+                $child_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", $parent_id, $post_type ) );
                 wp_cache_set( $cache_id, $child_id, 'bbpress_posts' );
         }
 
         // Filter and return
-        return apply_filters( 'bbp_get_public_child_last_id', (int) $child_id, $parent_id, $post_type );
+        return (int) apply_filters( 'bbp_get_public_child_last_id', (int) $child_id, (int) $parent_id, $post_type );
 }
 
 /**
@@ -1576 +1576 @@
                 // Join post statuses together
                 $post_status = "'" . implode( "', '", $post_status ) . "'";
 
-                $child_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $parent_id, $post_type ) );
+                $child_count = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $parent_id, $post_type ) );
                 wp_cache_set( $cache_id, $child_count, 'bbpress_posts' );
         }
 
         // Filter and return
-        return apply_filters( 'bbp_get_public_child_count', (int) $child_count, $parent_id, $post_type );
+        return (int) apply_filters( 'bbp_get_public_child_count', (int) $child_count, (int) $parent_id, $post_type );
 }
 
 /**
@@ -1629 +1629 @@
         }
 
         // Filter and return
-        return apply_filters( 'bbp_get_public_child_ids', $child_ids, $parent_id, $post_type );
+        return (array) apply_filters( 'bbp_get_public_child_ids', (array) $child_ids, (int) $parent_id, $post_type );
 }
 
 /**
@@ -1693 +1693 @@
         }
 
         // Filter and return
-        return apply_filters( 'bbp_get_all_child_ids', $child_ids, (int) $parent_id, $post_type );
+        return (array) apply_filters( 'bbp_get_all_child_ids', (array) $child_ids, (int) $parent_id, $post_type );
 }
 
 /** Globals *******************************************************************/

src/includes/forums/functions.php

@@ -1452 +1452 @@
         $total_topics = $topics + $children_topic_count;
 
         // Update the count
-        update_post_meta( $forum_id, '_bbp_topic_count',       (int) $topics       );
-        update_post_meta( $forum_id, '_bbp_total_topic_count', (int) $total_topics );
+        update_post_meta( $forum_id, '_bbp_topic_count',       $topics       );
+        update_post_meta( $forum_id, '_bbp_total_topic_count', $total_topics );
 
-        return (int) apply_filters( 'bbp_update_forum_topic_count', (int) $total_topics, $forum_id );
+        return (int) apply_filters( 'bbp_update_forum_topic_count', $total_topics, $forum_id );
 }
 
 /**
@@ -1919 +1919 @@
 function bbp_forum_query_topic_ids( $forum_id ) {
         $topic_ids = bbp_get_public_child_ids( $forum_id, bbp_get_topic_post_type() );
 
-        return apply_filters( 'bbp_forum_query_topic_ids', $topic_ids, $forum_id );
+        return (array) apply_filters( 'bbp_forum_query_topic_ids', $topic_ids, $forum_id );
 }
 
 /**
@@ -1939 +1939 @@
         $subforum_ids = bbp_get_all_child_ids( $forum_id, bbp_get_forum_post_type() );
         //usort( $subforum_ids, '_bbp_forum_query_usort_subforum_ids' );
 
-        return apply_filters( 'bbp_get_forum_subforum_ids', $subforum_ids, $forum_id );
+        return (array) apply_filters( 'bbp_get_forum_subforum_ids', $subforum_ids, $forum_id );
 }
 
 /**
@@ -1989 +1989 @@
                         $reply_id  = (int) $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_parent IN ( {$topic_ids} ) AND post_status = '%s' AND post_type = '%s' ORDER BY ID DESC LIMIT 1;", bbp_get_public_status_id(), bbp_get_reply_post_type() ) );
                         wp_cache_set( $cache_id, $reply_id, 'bbpress_posts' ); // May be (int) 0
                 } else {
-                        wp_cache_set( $cache_id, '0', 'bbpress_posts' );
+                        wp_cache_set( $cache_id, 0, 'bbpress_posts' );
                 }
         }
 
-        return (int) apply_filters( 'bbp_get_forum_last_reply_id', (int) $reply_id, $forum_id );
+        return (int) apply_filters( 'bbp_get_forum_last_reply_id', $reply_id, $forum_id );
 }
 
 /** Listeners *****************************************************************/

src/includes/replies/functions.php

@@ -1059 +1059 @@
         // Update the forum ID
         bbp_update_forum_id( $reply_id, $forum_id );
 
-        return apply_filters( 'bbp_update_reply_forum_id', (int) $forum_id, $reply_id );
+        return (int) apply_filters( 'bbp_update_reply_forum_id', (int) $forum_id, $reply_id );
 }
 
 /**
@@ -1108 +1108 @@
         // Update the topic ID
         bbp_update_topic_id( $reply_id, $topic_id );
 
-        return apply_filters( 'bbp_update_reply_topic_id', (int) $topic_id, $reply_id );
+        return (int) apply_filters( 'bbp_update_reply_topic_id', (int) $topic_id, $reply_id );
 }
 
 /*
@@ -1192 +1192 @@
                 }
         }
 
-        return apply_filters( 'bbp_get_reply_ancestors', $ancestors, $reply_id );
+        return (array) apply_filters( 'bbp_get_reply_ancestors', $ancestors, $reply_id );
 }
 
 /**

src/includes/topics/functions.php

@@ -2336 +2336 @@
         // 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   = $reply_count + $difference;
 
         // Update this topic id's reply count
-        update_post_meta( $topic_id, '_bbp_reply_count', (int) $new_count );
+        update_post_meta( $topic_id, '_bbp_reply_count', $new_count );
 
-        return (int) apply_filters( 'bbp_bump_topic_reply_count', (int) $new_count, $topic_id, (int) $difference );
+        return (int) apply_filters( 'bbp_bump_topic_reply_count', $new_count, $topic_id, $difference );
 }
 
 /**
@@ -2363 +2364 @@
         // 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   = $reply_count + $difference;
 
         // Update this topic id's hidder reply count
-        update_post_meta( $topic_id, '_bbp_reply_count_hidden', (int) $new_count );
+        update_post_meta( $topic_id, '_bbp_reply_count_hidden', $new_count );
 
-        return (int) apply_filters( 'bbp_bump_topic_reply_count_hidden', (int) $new_count, $topic_id, (int) $difference );
+        return (int) apply_filters( 'bbp_bump_topic_reply_count_hidden', $new_count, $topic_id, $difference );
 }
 
 /** Topic Updaters ************************************************************/
@@ -2403 +2405 @@
                 $forum_id = get_post_field( 'post_parent', $topic_id );
         }
 
-        update_post_meta( $topic_id, '_bbp_forum_id', (int) $forum_id );
+        $forum_id = (int) $forum_id;
 
-        return apply_filters( 'bbp_update_topic_forum_id', (int) $forum_id, $topic_id );
+        update_post_meta( $topic_id, '_bbp_forum_id', $forum_id );
+
+        return (int) apply_filters( 'bbp_update_topic_forum_id', $forum_id, $topic_id );
 }
 
 /**
@@ -2422 +2426 @@
 function bbp_update_topic_topic_id( $topic_id = 0 ) {
         $topic_id = bbp_get_topic_id( $topic_id );
 
-        update_post_meta( $topic_id, '_bbp_topic_id', (int) $topic_id );
+        update_post_meta( $topic_id, '_bbp_topic_id', $topic_id );
 
-        return apply_filters( 'bbp_update_topic_topic_id', (int) $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_topic_id', $topic_id );
 }
 
 /**
@@ -2458 +2462 @@
                 $reply_count = bbp_get_public_child_count( $topic_id, bbp_get_reply_post_type() );
         }
 
-        update_post_meta( $topic_id, '_bbp_reply_count', (int) $reply_count );
+        $reply_count = (int) $reply_count;
+
+        update_post_meta( $topic_id, '_bbp_reply_count', $reply_count );
 
-        return apply_filters( 'bbp_update_topic_reply_count', (int) $reply_count, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_reply_count', $reply_count, $topic_id );
 }
 
 /**
@@ -2501 +2507 @@
                 $reply_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_parent = %d AND post_status IN ( {$post_status} ) AND post_type = '%s';", $topic_id, bbp_get_reply_post_type() ) );
         }
 
-        update_post_meta( $topic_id, '_bbp_reply_count_hidden', (int) $reply_count );
+        $reply_count = (int) $reply_count;
+
+        update_post_meta( $topic_id, '_bbp_reply_count_hidden', $reply_count );
 
-        return apply_filters( 'bbp_update_topic_reply_count_hidden', (int) $reply_count, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_reply_count_hidden', $reply_count, $topic_id );
 }
 
 /**
@@ -2544 +2552 @@
 
         // Update only if published
         if ( bbp_get_public_status_id() === get_post_status( $active_id ) ) {
-                update_post_meta( $topic_id, '_bbp_last_active_id', (int) $active_id );
+                update_post_meta( $topic_id, '_bbp_last_active_id', $active_id );
         }
 
-        return apply_filters( 'bbp_update_topic_last_active_id', (int) $active_id, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_last_active_id', $active_id, $topic_id );
 }
 
 /**
@@ -2625 +2633 @@
 
         // Update if reply is published
         if ( bbp_is_reply_published( $reply_id ) ) {
-                update_post_meta( $topic_id, '_bbp_last_reply_id', (int) $reply_id );
+                update_post_meta( $topic_id, '_bbp_last_reply_id', $reply_id );
         }
 
-        return apply_filters( 'bbp_update_topic_last_reply_id', (int) $reply_id, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_last_reply_id', $reply_id, $topic_id );
 }
 
 /**
@@ -2666 +2674 @@
         $voices = $wpdb->get_col( $wpdb->prepare( "SELECT COUNT( DISTINCT post_author ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' ) OR ( ID = %d AND post_type = '%s' );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
 
         // If there's an error, make sure we have at least have 1 voice
-        $voices = ( empty( $voices ) || is_wp_error( $voices ) ) ? 1 : $voices[0];
+        $voices = ( empty( $voices ) || is_wp_error( $voices ) ) ? 1 : (int) $voices[0];
 
         // Update the voice count for this topic id
-        update_post_meta( $topic_id, '_bbp_voice_count', (int) $voices );
+        update_post_meta( $topic_id, '_bbp_voice_count', $voices );
 
-        return apply_filters( 'bbp_update_topic_voice_count', (int) $voices, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_voice_count', $voices, $topic_id );
 }
 
 /**
@@ -2707 +2715 @@
 
         $anonymous_replies = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( ID ) FROM {$wpdb->posts} WHERE ( post_parent = %d AND post_status = '%s' AND post_type = '%s' AND post_author = 0 ) OR ( ID = %d AND post_type = '%s' AND post_author = 0 );", $topic_id, bbp_get_public_status_id(), bbp_get_reply_post_type(), $topic_id, bbp_get_topic_post_type() ) );
 
-        update_post_meta( $topic_id, '_bbp_anonymous_reply_count', (int) $anonymous_replies );
+        update_post_meta( $topic_id, '_bbp_anonymous_reply_count', $anonymous_replies );
 
-        return apply_filters( 'bbp_update_topic_anonymous_reply_count', (int) $anonymous_replies, $topic_id );
+        return (int) apply_filters( 'bbp_update_topic_anonymous_reply_count', $anonymous_replies, $topic_id );
 }
 
 /**