Changeset 2851 for branches/plugin/bbp-includes/bbp-forum-template.php

Timestamp:

02/06/2011 05:05:23 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Cast return values as (int) where appropriate. Adjust _last_ functions to be more friendly with anonymous user data. Test some logic with _last_ forum/topic/reply where if reply_id does not exist, fall back to topic_id. Remove various strict empty string checks as they should no longer be needed.

File:

• branches/plugin/bbp-includes/bbp-forum-template.php (modified) (8 diffs)

branches/plugin/bbp-includes/bbp-forum-template.php

@@ -373 +373 @@
  */
 function bbp_get_forum_parent( $forum_id = 0 ) {
-    $forum_id = bbp_get_forum_id( $forum_id );
-    return apply_filters( 'bbp_get_forum_parent', (int) get_post_field( 'post_parent', $forum_id ), $forum_id );
+    $forum_id  = bbp_get_forum_id( $forum_id );
+    $parent_id = get_post_field( 'post_parent', $forum_id );
+
+    return apply_filters( 'bbp_get_forum_parent', (int) $parent_id, $forum_id );
 }
 
@@ -546 +548 @@
         $topic_id = get_post_meta( $forum_id, '_bbp_forum_last_topic_id', true );
 
-        return apply_filters( 'bbp_get_forum_last_topic_id', $topic_id, $forum_id );
+        return apply_filters( 'bbp_get_forum_last_topic_id', (int) $topic_id, $forum_id );
     }
 
@@ -624 +626 @@
     $forum_id  = bbp_get_forum_id( $forum_id );
     $author_id = bbp_get_topic_author_id( bbp_get_forum_last_topic_id( $forum_id ) );
-    return apply_filters( 'bbp_get_forum_last_topic_author_id', $author_id, $forum_id );
+    return apply_filters( 'bbp_get_forum_last_topic_author_id', (int) $author_id, $forum_id );
 }
 
@@ -691 +693 @@
         $reply_id = get_post_meta( $forum_id, '_bbp_forum_last_reply_id', true );
 
-        if ( '' === $reply_id )
-            $reply_id = bbp_update_forum_last_reply_id( $forum_id );
-
-        return apply_filters( 'bbp_get_forum_last_reply_id', $reply_id, $forum_id );
+        if ( empty( $reply_id ) )
+            $reply_id = bbp_get_forum_last_topic_id( $forum_id );
+
+        return apply_filters( 'bbp_get_forum_last_reply_id', (int) $reply_id, $forum_id );
     }
 
@@ -891 +893 @@
     function bbp_get_forum_subforum_count( $forum_id = 0 ) {
         $forum_id    = bbp_get_forum_id( $forum_id );
-        $forum_count = get_post_meta( $forum_id, '_bbp_forum_subforum_count', true );
-
-        if ( '' === $forum_count )
-            $forum_count = bbp_update_forum_subforum_count( $forum_id );
+        $forum_count = (int) get_post_meta( $forum_id, '_bbp_forum_subforum_count', true );
 
         return apply_filters( 'bbp_get_forum_subforum_count', (int) $forum_count, $forum_id );
@@ -929 +928 @@
     function bbp_get_forum_topic_count( $forum_id = 0, $total_count = true ) {
         $forum_id = bbp_get_forum_id( $forum_id );
-        $topics  = get_post_meta( $forum_id, empty( $total_count ) ? '_bbp_forum_topic_count' : '_bbp_forum_total_topic_count', true );
-
-        if ( '' === $topics )
-            $topics = bbp_update_forum_topic_count( $forum_id, $total_count );
+        $topics   = get_post_meta( $forum_id, empty( $total_count ) ? '_bbp_forum_topic_count' : '_bbp_forum_total_topic_count', true );
 
         return apply_filters( 'bbp_get_forum_topic_count', (int) $topics, $forum_id );
@@ -969 +965 @@
         $replies  = get_post_meta( $forum_id, empty( $total_count ) ? '_bbp_forum_reply_count' : '_bbp_forum_total_reply_count', true );
 
-        if ( '' === $replies )
-            $replies = bbp_update_forum_reply_count( $forum_id, $total_count );
-
         return apply_filters( 'bbp_get_forum_reply_count', (int) $replies, $forum_id );
     }
@@ -1003 +996 @@
         $forum_id = bbp_get_forum_id( $forum_id );
         $voices   = get_post_meta( $forum_id, '_bbp_forum_voice_count', true );
-
-        if ( '' === $voices )
-            $voices = bbp_update_forum_voice_count( $forum_id );
 
         return apply_filters( 'bbp_get_forum_voice_count', (int) $voices, $forum_id );