Ticket #2811: 2811.forums_fixes.01.patch

src/includes/forums/functions.php

@@ -1205 +1205 @@
  * @uses update_post_meta() To update the forum's last active id meta
  * @uses apply_filters() Calls 'bbp_update_forum_last_topic_id' with the last
  *                        reply id and forum id
- * @return bool True on success, false on failure
+ * @return int Id of the forum's most recent topic
  */
 function bbp_update_forum_last_topic_id( $forum_id = 0, $topic_id = 0 ) {
         $forum_id = bbp_get_forum_id( $forum_id );
@@ -1218 +1218 @@
 
                 // Loop through children and add together forum reply counts
                 $children = bbp_forum_query_subforum_ids( $forum_id );
-                if ( !empty( $children ) ) {
+                if ( ! empty( $children ) ) {
                         foreach ( $children as $child ) {
                                 $children_last_topic = bbp_update_forum_last_topic_id( $child ); // Recursive
                         }
@@ -1236 +1236 @@
 
                 // Get the most recent topic in this forum_id
                 $recent_topic = get_posts( $post_vars );
-                if ( !empty( $recent_topic ) ) {
+                if ( ! empty( $recent_topic ) ) {
                         $topic_id = $recent_topic[0]->ID;
                 }
         }
@@ -1246 +1246 @@
         $children_last_topic = (int) $children_last_topic;
 
         // If child forums have higher id, use that instead
-        if ( !empty( $children ) && ( $children_last_topic > $topic_id ) ) {
+        if ( ! empty( $children ) && ( $children_last_topic > $topic_id ) ) {
                 $topic_id = $children_last_topic;
         }
 
@@ -1275 +1275 @@
  * @uses update_post_meta() To update the forum's last active id meta
  * @uses apply_filters() Calls 'bbp_update_forum_last_reply_id' with the last
  *                        reply id and forum id
- * @return bool True on success, false on failure
+ * @return int Id of the forum's most recent reply
  */
 function bbp_update_forum_last_reply_id( $forum_id = 0, $reply_id = 0 ) {
         $forum_id = bbp_get_forum_id( $forum_id );
@@ -1288 +1288 @@
 
                 // Loop through children and get the most recent reply id
                 $children = bbp_forum_query_subforum_ids( $forum_id );
-                if ( !empty( $children ) ) {
+                if ( ! empty( $children ) ) {
                         foreach ( $children as $child ) {
                                 $children_last_reply = bbp_update_forum_last_reply_id( $child ); // Recursive
                         }
@@ -1296 +1296 @@
 
                 // If this forum has topics...
                 $topic_ids = bbp_forum_query_topic_ids( $forum_id );
-                if ( !empty( $topic_ids ) ) {
+                if ( ! empty( $topic_ids ) ) {
 
                         // ...get the most recent reply from those topics...
                         $reply_id = bbp_forum_query_last_reply_id( $forum_id, $topic_ids );
@@ -1311 +1311 @@
         $children_last_reply = (int) $children_last_reply;
 
         // If child forums have higher ID, check for newer reply id
-        if ( !empty( $children ) && ( $children_last_reply > $reply_id ) ) {
+        if ( ! empty( $children ) && ( $children_last_reply > $reply_id ) ) {
                 $reply_id = $children_last_reply;
         }
 
@@ -1340 +1340 @@
  * @uses update_post_meta() To update the forum's last active id meta
  * @uses apply_filters() Calls 'bbp_update_forum_last_active_id' with the last
  *                        active post id and forum id
- * @return bool True on success, false on failure
+ * @return int Id of the forum's last active post
  */
 function bbp_update_forum_last_active_id( $forum_id = 0, $active_id = 0 ) {
 
@@ -1354 +1354 @@
 
                 // Loop through children and add together forum reply counts
                 $children = bbp_forum_query_subforum_ids( $forum_id );
-                if ( !empty( $children ) ) {
+                if ( ! empty( $children ) ) {
                         foreach ( $children as $child ) {
                                 $children_last_active = bbp_update_forum_last_active_id( $child, $active_id );
                         }
@@ -1362 +1362 @@
 
                 // Don't count replies if the forum is a category
                 $topic_ids = bbp_forum_query_topic_ids( $forum_id );
-                if ( !empty( $topic_ids ) ) {
+                if ( ! empty( $topic_ids ) ) {
                         $active_id = bbp_forum_query_last_reply_id( $forum_id, $topic_ids );
                         $active_id = $active_id > max( $topic_ids ) ? $active_id : max( $topic_ids );
 
@@ -1377 +1377 @@
         $children_last_active = (int) $children_last_active;
 
         // If child forums have higher id, use that instead
-        if ( !empty( $children ) && ( $children_last_active > $active_id ) ) {
+        if ( ! empty( $children ) && ( $children_last_active > $active_id ) ) {
                 $active_id = $children_last_active;
         }
 
@@ -1402 +1402 @@
  * @uses update_post_meta() To update the forum last active time
  * @uses apply_filters() Calls 'bbp_update_forum_last_active' with the new time
  *                        and forum id
- * @return bool True on success, false on failure
+ * @return string MySQL timestamp of last active topic/reply
  */
 function bbp_update_forum_last_active_time( $forum_id = 0, $new_time = '' ) {
         $forum_id = bbp_get_forum_id( $forum_id );
@@ -1413 +1413 @@
         }
 
         // Update only if there is a time
-        if ( !empty( $new_time ) ) {
+        if ( ! empty( $new_time ) ) {
                 update_post_meta( $forum_id, '_bbp_last_active_time', $new_time );
         }
 
-        return (int) apply_filters( 'bbp_update_forum_last_active', $new_time, $forum_id );
+        return apply_filters( 'bbp_update_forum_last_active', $new_time, $forum_id );
 }
 
 /**