Changeset 2933

Timestamp:

02/24/2011 10:20:13 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Add checks to supplemental topic and reply actions to make sure those actions are only called on those kinds of objects. Also perform sanity check on $argspost_parent? before attempting to unset it in bbp_has_topics()

Location:

branches/plugin/bbp-includes

Files:

• bbp-reply-functions.php (modified) (7 diffs)
• bbp-topic-functions.php (modified) (6 diffs)
• bbp-topic-template.php (modified) (2 diffs)

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

@@ -426 +426 @@
 function bbp_update_reply_walker( $reply_id, $last_active_time = '', $forum_id = 0, $topic_id = 0, $refresh = true ) {
 
-    // Verifiy the reply ID
+    // Verify the reply ID
     if ( $reply_id = bbp_get_reply_id ( $reply_id ) ) {
 
@@ -693 +693 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 
@@ -702 +702 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 
@@ -711 +711 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 
@@ -722 +722 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 
@@ -731 +731 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 
@@ -740 +740 @@
     $reply_id = bbp_get_reply_id( $reply_id );
 
-    if ( empty( $reply_id ) )
+    if ( empty( $reply_id ) || !bbp_is_reply( $reply_id ) )
         return false;
 

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

@@ -1848 +1848 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 
@@ -1865 +1865 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 
@@ -1890 +1890 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 
@@ -1907 +1907 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 
@@ -1916 +1916 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 
@@ -1925 +1925 @@
     $topic_id = bbp_get_topic_id( $topic_id );
 
-    if ( empty( $topic_id ) )
+    if ( empty( $topic_id ) || !bbp_is_topic( $topic_id ) )
         return false;
 

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

@@ -104 +104 @@
         // Remove post_parent from possible assignments
         unset( $default['post_parent'] );
-        unset( $args['post_parent']    );
+        if ( isset( $args['post_parent'] ) ) unset( $args['post_parent'] );
 
         // Reassign post_parent to current ID
@@ -308 +308 @@
         elseif ( ( bbp_is_topic() || bbp_is_topic_edit() ) && isset( $wp_query->post->ID ) )
             $bbp_topic_id = $wp_query->post->ID;
-
-        // Currently viewing a singular reply
-        elseif ( ( bbp_is_reply() || bbp_is_reply_edit() ) )
-            $bbp_topic_id = bbp_get_reply_topic_id();
 
         // Fallback