Ticket #2190: 2190.diff

bp-core/bp-core-wpabstraction.php

@@ -89 +89 @@
                 return true;
         }
 }
+
+function bp_activate_site_options( $keys = array() ) {
+        global $bp;
+        if ( !empty( $keys ) && is_array( $keys ) ) {
+                foreach ( $keys as $key => $default ) {
+                        if ( empty( $bp->site_options[ $key ] ) ) {
+                                $bp->site_options[ $key ] = get_blog_option( BP_ROOT_BLOG, $key, $default );
+                                update_site_option( $key, $bp->site_options[ $key ] );
+                        }
+                }
+        }
+}

bp-loader.php

@@ -64 +64 @@
         if ( 'bp-sn-parent' == get_blog_option( BP_ROOT_BLOG, 'template' ) && 'bp-default' == get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) )
                 switch_theme( 'bp-default', 'bp-default' );
 
+        bp_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' );
 }
 register_activation_hook( 'buddypress/bp-loader.php', 'bp_loader_activate' );
@@ -87 +90 @@
 }
 register_deactivation_hook( 'buddypress/bp-loader.php', 'bp_loader_deactivate' );
 
-?>
- No newline at end of file
+?>

bp-xprofile.php

@@ -27 +27 @@
         if ( !empty($wpdb->charset) )
                 $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' );
+        bp_activate_site_options( array( 'bp-xprofile-base-group-name' => 'Base', 'bp-xprofile-fullname-field-name' => 'Name' ) );
 
-        if ( empty( $bp->site_options['bp-xprofile-fullname-field-name'] ) )
-                update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
-
         $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
                           id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
                           name varchar(150) NOT NULL,