Changeset 5113

Timestamp:

10/02/2013 09:52:34 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Fix theme-side forum editing debug notices. See #2408. (2.4.1)

Location:

branches/2.4/includes/forums

Files:

• functions.php (modified) (2 diffs)
• template.php (modified) (1 diff)

branches/2.4/includes/forums/functions.php

@@ -170 +170 @@
 
     // Forum parent was passed (the norm)
-    if ( !empty( $_POST['bbp_forum_parent_id'] ) )
-        $forum_parent_id = (int) $_POST['bbp_forum_parent_id'];
+    if ( !empty( $_POST['bbp_forum_parent_id'] ) ) {
+        $forum_parent_id = bbp_get_forum_id( $_POST['bbp_forum_parent_id'] );
+    }
 
     // Filter and sanitize
@@ -416 +417 @@
 
     // Forum parent id was passed
-    if ( is_numeric( $_POST['bbp_forum_parent_id'] ) ) {
-        $forum_parent_id = (int) $_POST['bbp_forum_parent_id'];
+    if ( !empty( $_POST['bbp_forum_parent_id'] ) ) {
+        $forum_parent_id = bbp_get_forum_id( $_POST['bbp_forum_parent_id'] );
     }
 

branches/2.4/includes/forums/template.php

@@ -158 +158 @@
 
         // Currently viewing a forum
-        } elseif ( bbp_is_single_forum() && !empty( $bbp->current_forum_id ) ) {
+        } elseif ( ( bbp_is_single_forum() || bbp_is_forum_edit() ) && !empty( $bbp->current_forum_id ) ) {
             $bbp_forum_id = $bbp->current_forum_id;
 
         // Currently viewing a forum
-        } elseif ( bbp_is_single_forum() && isset( $wp_query->post->ID ) ) {
+        } elseif ( ( bbp_is_single_forum() || bbp_is_forum_edit() ) && isset( $wp_query->post->ID ) ) {
             $bbp_forum_id = $wp_query->post->ID;