Changeset 3025

Timestamp:

04/24/2011 12:11:59 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Fix bug where switching visibilities could cause a misalignment of hidden/private site values.

File:

• branches/plugin/bbp-includes/bbp-forum-functions.php (modified) (6 diffs)

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

@@ -183 +183 @@
 
             // Find this forum in the array
-            $offset = array_search( $forum_id, $private );
-
-            // Splice around it
-            array_splice( $private, $offset, 1 );
-
-            // Update private forums minus this one
-            update_option( '_bbp_private_forums', $private );
+            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 ) ) );
+            }
         }
 
@@ -199 +202 @@
 
             // Find this forum in the array
-            $offset = array_search( $forum_id, $hidden );
-
-            // Splice around it
-            array_splice( $hidden, $offset, 1 );
-
-            // Update hidden forums minus this one
-            update_option( '_bbp_hidden_forums', $hidden );
+            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 ) ) );
+            }
         }
 
@@ -242 +248 @@
 
             // Find this forum in the array
-            $offset = array_search( $forum_id, $hidden );
-
-            // Splice around it
-            array_splice( $hidden, $offset, 1 );
-
-            // Update hidden forums minus this one
-            update_option( '_bbp_hidden_forums', $hidden );
+            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 ) ) );
+            }
         }
 
@@ -254 +263 @@
         $private   = bbp_get_private_forum_ids();
         $private[] = $forum_id;
-        update_option( '_bbp_private_forums', $private );
+        update_option( '_bbp_private_forums', array_unique( array_values( $private ) ) );
 
         // Update forums visibility setting
@@ -290 +299 @@
 
             // Find this forum in the array
-            if ( $offset = array_search( $forum_id, $private ) ) {
+            if ( in_array( $forum_id, $private ) ) {
+
+                $offset = array_search( $forum_id, (array) $private );
 
                 // Splice around it
@@ -296 +307 @@
 
                 // Update private forums minus this one
-                update_option( '_bbp_private_forums', $private );
+                update_option( '_bbp_private_forums', array_unique( array_values( $private ) ) );
             }
         }
 
         // Add to '_bbp_hidden_forums' site option
-        $hidden   = bbp_get_private_forum_ids();
+        $hidden   = bbp_get_hidden_forum_ids();
         $hidden[] = $forum_id;
-        update_option( '_bbp_hidden_forums', $hidden );
+        update_option( '_bbp_hidden_forums', array_unique( array_values( $hidden ) ) );
 
         // Update forums visibility setting