Changeset 3750

Timestamp:

02/19/2012 12:53:44 AM (13 years ago)

Author:

johnjamesjacoby

Message:

When setting a forum as public, always check private and hidden forum options and remove forum_id if needed. Fixes #1757.

Location:

branches/plugin

Files:

• bbp-admin/bbp-forums.php (modified) (1 diff)
• bbp-includes/bbp-forum-functions.php (modified) (2 diffs)

branches/plugin/bbp-admin/bbp-forums.php

@@ -305 +305 @@
             return $forum_id;
 
-        // Load the forum
-        $forum = bbp_get_forum( $forum_id );
-        if ( empty( $forum ) )
-            return $forum_id;
+        // Bail if post_type is not a topic or reply
+        if ( get_post_type( $forum_id ) != $this->post_type )
+            return;
 
         // Parent ID

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

@@ -649 +649 @@
         $visibility = bbp_get_forum_visibility( $forum_id );
 
-        // If new visibility is different, change it
-        if ( $visibility != $_POST['bbp_forum_visibility'] ) {
-
-            // What is the new forum visibility setting?
-            switch ( $_POST['bbp_forum_visibility'] ) {
-
-                // Hidden
-                case bbp_get_hidden_status_id()  :
-                    bbp_hide_forum( $forum_id, $visibility );
-                    break;
-
-                // Private
-                case bbp_get_private_status_id() :
-                    bbp_privatize_forum( $forum_id, $visibility );
-                    break;
-
-                // Publish (default)
-                case bbp_get_public_status_id()  :
-                default        :
-                    bbp_publicize_forum( $forum_id, $visibility );
-                    break;
-            }
+        // What is the new forum visibility setting?
+        switch ( $_POST['bbp_forum_visibility'] ) {
+
+            // Hidden
+            case bbp_get_hidden_status_id()  :
+                bbp_hide_forum( $forum_id, $visibility );
+                break;
+
+            // Private
+            case bbp_get_private_status_id() :
+                bbp_privatize_forum( $forum_id, $visibility );
+                break;
+
+            // Publish (default)
+            case bbp_get_public_status_id()  :
+            default        :
+                bbp_publicize_forum( $forum_id, $visibility );
+                break;
         }
     }
@@ -806 +802 @@
     do_action( 'bbp_publicize_forum',  $forum_id );
 
+    // Get private forums
+    $private = bbp_get_private_forum_ids();
+
+    // Find this forum in the array
+    if ( in_array( $forum_id, $private ) ) {
+
+        $offset = array_search( $forum_id, (array) $private );
+
+        // Splice around it
+        array_splice( $private, $offset, 1 );
+
+        // Update private forums minus this one
+        update_option( '_bbp_private_forums', array_unique( array_values( $private ) ) );
+    }
+
+    // Get hidden forums
+    $hidden = bbp_get_hidden_forum_ids();
+
+    // Find this forum in the array
+    if ( in_array( $forum_id, $hidden ) ) {
+
+        $offset = array_search( $forum_id, (array) $hidden );
+
+        // Splice around it
+        array_splice( $hidden, $offset, 1 );
+
+        // Update hidden forums minus this one
+        update_option( '_bbp_hidden_forums', array_unique( array_values( $hidden ) ) );
+    }
+
     // Only run queries if visibility is changing
     if ( bbp_get_public_status_id() != $current_visibility ) {
-
-        // Remove from _bbp_private_forums site option
-        if ( bbp_get_private_status_id() == $current_visibility ) {
-
-            // Get private forums
-            $private = bbp_get_private_forum_ids();
-
-            // Find this forum in the array
-            if ( in_array( $forum_id, $private ) ) {
-
-                $offset = array_search( $forum_id, (array) $private );
-
-                // Splice around it
-                array_splice( $private, $offset, 1 );
-
-                // Update private forums minus this one
-                update_option( '_bbp_private_forums', array_unique( array_values( $private ) ) );
-            }
-        }
-
-        // Remove from _bbp_hidden_forums site option
-        if ( bbp_get_hidden_status_id() == $current_visibility ) {
-
-            // Get hidden forums
-            $hidden = bbp_get_hidden_forum_ids();
-
-            // Find this forum in the array
-            if ( in_array( $forum_id, $hidden ) ) {
-
-                $offset = array_search( $forum_id, (array) $hidden );
-
-                // Splice around it
-                array_splice( $hidden, $offset, 1 );
-
-                // Update hidden forums minus this one
-                update_option( '_bbp_hidden_forums', array_unique( array_values( $hidden ) ) );
-            }
-        }
 
         // Update forum post_status