Ticket #2647: 2647.diff

src/includes/forums/functions.php

@@ -631 +631 @@
 
         /** Forum Status ******************************************************/
 
-        if ( !empty( $_POST['bbp_forum_status'] ) && in_array( $_POST['bbp_forum_status'], array( 'open', 'closed' ) ) ) {
-                if ( 'closed' === $_POST['bbp_forum_status'] && !bbp_is_forum_closed( $forum_id, false ) ) {
+        if ( ! empty( $_POST['bbp_forum_status'] ) && in_array( $_POST['bbp_forum_status'], array( 'open', 'closed' ) ) ) {
+                if ( 'closed' === $_POST['bbp_forum_status'] && ! bbp_is_forum_closed( $forum_id, false ) ) {
                         bbp_close_forum( $forum_id );
+                } elseif ( 'open' === $_POST['bbp_forum_status'] && bbp_is_forum_open( $forum_id, false ) ) {
+                        bbp_open_forum( $forum_id );
                 } elseif ( 'open' === $_POST['bbp_forum_status'] && bbp_is_forum_closed( $forum_id, false ) ) {
                         bbp_open_forum( $forum_id );
                 }
@@ -641 +643 @@
 
         /** Forum Type ********************************************************/
 
-        if ( !empty( $_POST['bbp_forum_type'] ) && in_array( $_POST['bbp_forum_type'], array( 'forum', 'category' ) ) ) {
-                if ( 'category' === $_POST['bbp_forum_type'] && !bbp_is_forum_category( $forum_id ) ) {
+        if ( ! empty( $_POST['bbp_forum_type'] ) && in_array( $_POST['bbp_forum_type'], array( 'forum', 'category' ) ) ) {
+                if ( 'category' === $_POST['bbp_forum_type'] && ! bbp_is_forum_category( $forum_id ) ) {
                         bbp_categorize_forum( $forum_id );
+                } elseif ( 'forum' === $_POST['bbp_forum_type'] && ! bbp_is_forum_category( $forum_id ) ) {
+                        bbp_normalize_forum( $forum_id );
                 } elseif ( 'forum' === $_POST['bbp_forum_type'] && bbp_is_forum_category( $forum_id ) ) {
                         bbp_normalize_forum( $forum_id );
                 }
@@ -949 +953 @@
         // First, delete everything.
         delete_option( '_bbp_private_forums' );
         delete_option( '_bbp_hidden_forums'  );
-        
+
         /**
          * Don't search for both private/hidden statuses. Since 'pre_get_posts' is an
-         * action, it's not removed by suppress_filters. We need to make sure that 
+         * action, it's not removed by suppress_filters. We need to make sure that
          * we're only searching for the supplied post_status.
          *
          * @see https://bbpress.trac.wordpress.org/ticket/2512
@@ -974 +978 @@
                 'post_status'      => bbp_get_hidden_status_id(),
                 'fields'           => 'ids'
         ) );
-        
+
         // Enable forum visibilty normalization
         add_action( 'pre_get_posts', 'bbp_pre_get_posts_normalize_forum_visibility', 4 );