Changeset 5976 for trunk/bp-core/bp-core-options.php

Timestamp:

04/10/2012 07:43:33 PM (13 years ago)

Author:

boonebgorges

Message:

When auto-migrating options in bp_core_get_root_options(), don't overwrite option values that are found on the first pass. Fixes #4139

File:

• trunk/bp-core/bp-core-options.php (modified) (3 diffs)

trunk/bp-core/bp-core-options.php

@@ -322 +322 @@
         $root_blog_options_meta = array_merge( $root_blog_options_meta, $network_options_meta );
     }
-
+    
     // Missing some options, so do some one-time fixing
     if ( empty( $root_blog_options_meta ) || ( count( $root_blog_options_meta ) < count( $root_blog_option_keys ) ) ) {
+
+        // Get a list of the keys that are already populated
+        $existing_options = array();
+        foreach( $root_blog_options_meta as $already_option ) {
+            $existing_options[$already_option->name] = $already_option->value;
+        }
 
         // Unset the query - We'll be resetting it soon
@@ -334 +340 @@
             unset( $old_meta_value );
 
+            if ( isset( $existing_options[$old_meta_key] ) ) {
+                continue;
+            }
+
             // Get old site option
             if ( is_multisite() )
@@ -348 +358 @@
             $root_blog_options_meta[$old_meta_key] = $old_meta_value;
         }
+        
+        $root_blog_options_meta = array_merge( $root_blog_options_meta, $existing_options );
+        unset( $existing_options );
 
     // We're all matched up