Changeset 2982

Timestamp:

05/03/2010 10:33:18 PM (14 years ago)

Author:

apeatling

Message:

Fixes #2190 props wpmuguru

Location:

branches/1.2

Files:

• bp-core.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

branches/1.2/bp-core.php

@@ -2006 +2006 @@
 add_action( 'admin_notices', 'bp_core_activation_notice' );
 
+/**
+ * bp_core_activate_site_options()
+ *
+ * When switching from single to multisite we need to copy blog options to
+ * site options.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_activate_site_options( $keys = array() ) {
+    global $bp;
+
+    if ( !empty( $keys ) && is_array( $keys ) ) {
+        $errors = false;
+
+        foreach ( $keys as $key => $default ) {
+            if ( empty( $bp->site_options[ $key ] ) ) {
+                $bp->site_options[ $key ] = get_blog_option( BP_ROOT_BLOG, $key, $default );
+
+                if ( !update_site_option( $key, $bp->site_options[ $key ] ) )
+                    $errors = true;
+            }
+        }
+
+        if ( empty( $errors ) )
+            return true;
+    }
+
+    return false;
+}
+
 /********************************************************************************
  * Custom Actions

branches/1.2/bp-loader.php

@@ -65 +65 @@
         switch_theme( 'bp-default', 'bp-default' );
 
+    /* Install site options on activation */
+    bp_core_activate_site_options( array( 'bp-disable-account-deletion' => 0, 'bp-disable-avatar-uploads' => 0, 'bp-disable-blogforum-comments' => 0,  'bp-disable-forum-directory' => 0,  'bp-disable-profile-sync' => 0 ) );
+
     do_action( 'bp_loader_activate' );
 }

branches/1.2/bp-xprofile.php

@@ -28 +28 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
 
-    if ( empty( $bp->site_options['bp-xprofile-base-group-name'] ) )
-        update_site_option( 'bp-xprofile-base-group-name', 'Base' );
-
-    if ( empty( $bp->site_options['bp-xprofile-fullname-field-name'] ) )
-        update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
+    bp_core_activate_site_options( array( 'bp-xprofile-base-group-name' => 'Base', 'bp-xprofile-fullname-field-name' => 'Name' ) );
 
     $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (