Changeset 2929

Timestamp:

02/23/2011 02:04:35 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Add sanity checks to _forum_id and _topic_id functions in bbp-reply-template.php. Add filter to bbp_is_reply_trash().

File:

• branches/plugin/bbp-includes/bbp-reply-template.php (modified) (6 diffs)

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

@@ -675 +675 @@
     $reply_status = bbp_get_reply_status( bbp_get_reply_id( $reply_id ) );
 
-    return apply_filters( 'bbp_is_reply_spam', $bbp->spam_status_id == $reply_status );
+    return apply_filters( 'bbp_is_reply_spam', $bbp->spam_status_id == $reply_status, $reply_id );
 }
 
@@ -692 +692 @@
 
     $reply_status = bbp_get_reply_status( bbp_get_reply_id( $reply_id ) );
-    return $bbp->trash_status_id == $reply_status;
+
+    return apply_filters( 'bbp_is_reply_trash', $bbp->trash_status_id == $reply_status, $reply_id );
 }
 
@@ -859 +860 @@
      */
     function bbp_get_reply_author_avatar( $reply_id = 0, $size = 40 ) {
-        $author_avatar = '';
-
         if ( $reply_id = bbp_get_reply_id( $reply_id ) ) {
             // Check for anonymous user
@@ -867 +866 @@
             else
                 $author_avatar = get_avatar( get_post_meta( $reply_id, '_bbp_anonymous_email', true ), $size );
+        } else {
+            $author_avatar = '';
         }
 
@@ -1053 +1054 @@
      */
     function bbp_get_reply_topic_id( $reply_id = 0 ) {
-        $reply_id = bbp_get_reply_id( $reply_id );
-        $topic_id = get_post_meta( $reply_id, '_bbp_topic_id', true );
-
-        // Fallback to post_parent if no meta exists, and set post meta
-        if ( empty( $topic_id ) ) {
-            $ancestors = get_post_ancestors( $reply_id );
-            foreach ( $ancestors as $ancestor ) {
-                if ( get_post_field( 'post_parent', $ancestor ) == bbp_get_topic_post_type() ) {
-                    $topic_id = $ancestor;
-                    continue;
+        if ( $reply_id = bbp_get_reply_id( $reply_id ) ) {
+            $topic_id = get_post_meta( $reply_id, '_bbp_topic_id', true );
+
+            // Fallback to post_parent if no meta exists, and set post meta
+            if ( empty( $topic_id ) ) {
+                $ancestors = get_post_ancestors( $reply_id );
+                foreach ( $ancestors as $ancestor ) {
+                    if ( get_post_field( 'post_parent', $ancestor ) == bbp_get_topic_post_type() ) {
+                        $topic_id = $ancestor;
+                        continue;
+                    }
                 }
+                bbp_update_reply_topic_id( $reply_id, $topic_id );
             }
-            bbp_update_reply_topic_id( $reply_id, $topic_id );
+
+            $topic_id = bbp_get_topic_id( $topic_id );
+        } else {
+            $topic_id = 0;
         }
-
-        $topic_id = bbp_get_topic_id( $topic_id );
 
         return apply_filters( 'bbp_get_reply_topic_id', (int) $topic_id, $reply_id );
@@ -1097 +1101 @@
      */
     function bbp_get_reply_forum_id( $reply_id = 0 ) {
-        $reply_id = bbp_get_reply_id( $reply_id );
-        $forum_id = get_post_meta( $reply_id, '_bbp_forum_id', true );
-
-        if ( empty( $forum_id ) ) {
-            $topic_id = bbp_get_reply_topic_id( $reply_id );
-            $forum_id = bbp_get_topic_forum_id( $topic_id );
-            bbp_update_reply_forum_id( $forum_id );
+        if ( $reply_id = bbp_get_reply_id( $reply_id ) ) {
+            $forum_id = get_post_meta( $reply_id, '_bbp_forum_id', true );
+
+            if ( empty( $forum_id ) ) {
+                $topic_id = bbp_get_reply_topic_id( $reply_id );
+                $forum_id = bbp_get_topic_forum_id( $topic_id );
+                bbp_update_reply_forum_id( $forum_id );
+            }
+
+            $forum_id = bbp_get_forum_id( $forum_id );
+        } else {
+            $forum_id = 0;
         }
-
-        $forum_id = bbp_get_forum_id( $forum_id );
 
         return apply_filters( 'bbp_get_reply_forum_id', (int) $forum_id, $reply_id );