Changeset 2914 for branches/plugin/bbp-includes/bbp-topic-functions.php

Timestamp:

02/18/2011 10:16:22 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Decouple bbp_is_ functionality from bbp_get_{post_type}_id functionality, and use correctly through-out. Add ability to show all forums regardless of post_parent, and fix forums widget to use this functionality correctly.

File:

• branches/plugin/bbp-includes/bbp-topic-functions.php (modified) (7 diffs)

branches/plugin/bbp-includes/bbp-topic-functions.php

@@ -1358 +1358 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
-        $topic_id = bbp_get_reply_topic_id( $reply_id );
+    if ( bbp_is_reply( $topic_id ) )
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
     else
         $topic_id = bbp_get_topic_id( $topic_id );
@@ -1391 +1391 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
+    if ( bbp_is_reply( $topic_id ) )
         $topic_id = bbp_get_reply_topic_id( $reply_id );
     else
@@ -1426 +1426 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
-        $topic_id = bbp_get_reply_topic_id( $reply_id );
+    if ( bbp_is_reply( $topic_id ) )
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
     else
         $topic_id = bbp_get_topic_id( $topic_id );
@@ -1455 +1455 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
-        $topic_id = bbp_get_reply_topic_id( $reply_id );
+    if ( bbp_is_reply( $topic_id ) )
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
     else
         $topic_id = bbp_get_topic_id( $topic_id );
@@ -1488 +1488 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
+    if ( bbp_is_reply( $topic_id ) )
         $topic_id = bbp_get_reply_topic_id( $reply_id );
     else
@@ -1517 +1517 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( empty( $reply_id ) && $reply_id = bbp_get_reply_id( $topic_id ) ) {
+    if ( empty( $reply_id ) && bbp_is_reply( $topic_id ) ) {
+        $reply_id = bbp_get_reply_id( $topic_id );
         $topic_id = bbp_get_reply_topic_id( $reply_id );
     } else {
@@ -1556 +1557 @@
 
     // If it's a reply, then get the parent (topic id)
-    if ( $reply_id = bbp_get_reply_id( $topic_id ) )
-        $topic_id = bbp_get_reply_topic_id( $reply_id );
+    if ( bbp_is_reply( $topic_id ) )
+        $topic_id = bbp_get_reply_topic_id( $topic_id );
     else
         $topic_id = bbp_get_topic_id( $topic_id );