<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2982] branches/1.2: Fixes #2190 props wpmuguru</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2982</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-05-03 22:33:18 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2190 props wpmuguru</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorephp">branches/1.2/bp-core.php</a></li>
<li><a href="#branches12bploaderphp">branches/1.2/bp-loader.php</a></li>
<li><a href="#branches12bpxprofilephp">branches/1.2/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core.php (2981 => 2982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core.php 2010-05-03 21:39:21 UTC (rev 2981)
+++ branches/1.2/bp-core.php 2010-05-03 22:33:18 UTC (rev 2982)
</span><span class="lines">@@ -2005,6 +2005,36 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'bp_core_activation_notice' );
</span><span class="cx">
</span><ins>+/**
+ * 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;
+}
+
</ins><span class="cx"> /********************************************************************************
</span><span class="cx"> * Custom Actions
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches12bploaderphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-loader.php (2981 => 2982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-loader.php 2010-05-03 21:39:21 UTC (rev 2981)
+++ branches/1.2/bp-loader.php 2010-05-03 22:33:18 UTC (rev 2982)
</span><span class="lines">@@ -64,6 +64,9 @@
</span><span class="cx"> if ( 'bp-sn-parent' == get_blog_option( BP_ROOT_BLOG, 'template' ) && 'bp-default' == get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) )
</span><span class="cx"> switch_theme( 'bp-default', 'bp-default' );
</span><span class="cx">
</span><ins>+ /* 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 ) );
+
</ins><span class="cx"> do_action( 'bp_loader_activate' );
</span><span class="cx"> }
</span><span class="cx"> register_activation_hook( 'buddypress/bp-loader.php', 'bp_loader_activate' );
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (2981 => 2982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2010-05-03 21:39:21 UTC (rev 2981)
+++ branches/1.2/bp-xprofile.php 2010-05-03 22:33:18 UTC (rev 2982)
</span><span class="lines">@@ -27,12 +27,8 @@
</span><span class="cx"> if ( !empty($wpdb->charset) )
</span><span class="cx"> $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
</span><span class="cx">
</span><del>- if ( empty( $bp->site_options['bp-xprofile-base-group-name'] ) )
- update_site_option( 'bp-xprofile-base-group-name', 'Base' );
</del><ins>+ bp_core_activate_site_options( array( 'bp-xprofile-base-group-name' => 'Base', 'bp-xprofile-fullname-field-name' => 'Name' ) );
</ins><span class="cx">
</span><del>- if ( empty( $bp->site_options['bp-xprofile-fullname-field-name'] ) )
- update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
-
</del><span class="cx"> $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
</span><span class="cx"> id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
</span><span class="cx"> name varchar(150) NOT NULL,
</span></span></pre>
</div>
</div>
</body>
</html>