<!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" />
<title>[BuddyPress][6067] trunk: Correct BuddyPress core settings values when upgrading from 1.5 to 1.6.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6067">6067</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-06-08 21:52:38 +0000 (Fri, 08 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Correct BuddyPress core settings values when upgrading from 1.5 to 1.6. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4008">#4008</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoresettingsphp">trunk/bp-core/admin/bp-core-settings.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-settings.php (6066 => 6067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-settings.php 2012-06-08 21:44:34 UTC (rev 6066)
+++ trunk/bp-core/admin/bp-core-settings.php 2012-06-08 21:52:38 UTC (rev 6067)
</span><span class="lines">@@ -208,11 +208,11 @@
</span><span class="cx">
</span><span class="cx"> // Some legacy options are not registered with the Settings API
</span><span class="cx"> $legacy_options = array(
</span><ins>+ 'bp-disable-account-deletion',
+ 'bp-disable-avatar-uploads',
</ins><span class="cx"> 'bp-disable-profile-sync',
</span><ins>+ 'bp_restrict_group_creation',
</ins><span class="cx"> 'hide-loggedout-adminbar',
</span><del>- 'bp-disable-avatar-uploads',
- 'bp-disable-account-deletion',
- 'bp_restrict_group_creation'
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> foreach( $legacy_options as $legacy_option ) {
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (6066 => 6067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-06-08 21:44:34 UTC (rev 6066)
+++ trunk/bp-core/admin/bp-core-update.php 2012-06-08 21:52:38 UTC (rev 6067)
</span><span class="lines">@@ -1037,6 +1037,30 @@
</span><span class="cx"> delete_blog_option( bp_get_root_blog_id(), 'bp-core-db-version' );
</span><span class="cx"> delete_site_option( bp_get_root_blog_id(), '_bp-core-db-version' );
</span><span class="cx"> delete_site_option( bp_get_root_blog_id(), '_bp_db_version' );
</span><ins>+
+ // Some legacy options need to be flipped from 1 to 0s
+ $legacy_options = array(
+ 'bp-disable-account-deletion',
+ 'bp-disable-avatar-uploads',
+ 'bp-disable-profile-sync',
+ 'bp_restrict_group_creation',
+ 'hide-loggedout-adminbar',
+ );
+
+ /**
+ * Note: Each of these options is represented by its opposite in the UI
+ * Ie, the Profile Syncing option reads "Enable Sync", so when it's checked,
+ * the corresponding option should be unset.
+ */
+ foreach( $legacy_options as $legacy_option ) {
+ $value = bp_get_option( $legacy_option );
+ if ( empty( $value ) )
+ $value = 1;
+ else
+ $value = 0;
+
+ bp_update_option( $legacy_option, $value );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (6066 => 6067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2012-06-08 21:44:34 UTC (rev 6066)
+++ trunk/bp-core/bp-core-admin.php 2012-06-08 21:52:38 UTC (rev 6067)
</span><span class="lines">@@ -282,13 +282,13 @@
</span><span class="cx"> // Add the main section
</span><span class="cx"> add_settings_section( 'bp_main', __( 'Main Settings', 'buddypress' ), 'bp_admin_setting_callback_main_section', 'buddypress' );
</span><span class="cx">
</span><del>- // Throttle setting
- add_settings_field( '_bp_admin_bar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' );
- register_setting ( 'buddypress', '_bp_admin_bar', 'intval' );
</del><ins>+ // Hide toolbar for logged out users setting
+ add_settings_field( 'hide-loggedout-adminbar', __( 'Toolbar', 'buddypress' ), 'bp_admin_setting_callback_admin_bar', 'buddypress', 'bp_main' );
+ register_setting ( 'buddypress', 'hide-loggedout-adminbar', 'intval' );
</ins><span class="cx">
</span><span class="cx"> // Allow favorites setting
</span><del>- add_settings_field( '_bp_account_deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
- register_setting ( 'buddypress', '_bp_account_deletion', 'intval' );
</del><ins>+ add_settings_field( 'bp-disable-account-deletion', __( 'Account Deletion', 'buddypress' ), 'bp_admin_setting_callback_account_deletion', 'buddypress', 'bp_main' );
+ register_setting ( 'buddypress', 'bp-disable-account-deletion', 'intval' );
</ins><span class="cx">
</span><span class="cx"> /** XProfile Section **************************************************/
</span><span class="cx">
</span><span class="lines">@@ -298,12 +298,12 @@
</span><span class="cx"> add_settings_section( 'bp_xprofile', __( 'Profile Settings', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> // Allow topic and reply revisions
</span><del>- add_settings_field( '_bp_avatar_uploads', __( 'Avatar Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', 'bp_xprofile' );
- register_setting ( 'buddypress', '_bp_avatar_uploads', 'intval' );
</del><ins>+ add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', 'bp_xprofile' );
+ register_setting ( 'buddypress', 'bp-disable-avatar-uploads', 'intval' );
</ins><span class="cx">
</span><span class="cx"> // Profile sync setting
</span><del>- add_settings_field( '_bp_profile_sync', __( 'Profile Syncing', 'buddypress' ), 'bp_admin_setting_callback_profile_sync', 'buddypress', 'bp_xprofile' );
- register_setting ( 'buddypress', '_bp_profile_sync', 'intval' );
</del><ins>+ add_settings_field( 'bp-disable-profile-sync', __( 'Profile Syncing', 'buddypress' ), 'bp_admin_setting_callback_profile_sync', 'buddypress', 'bp_xprofile' );
+ register_setting ( 'buddypress', 'bp-disable-profile-sync', 'intval' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Groups Section ****************************************************/
</span><span class="lines">@@ -314,8 +314,8 @@
</span><span class="cx"> add_settings_section( 'bp_groups', __( 'Groups Settings', 'buddypress' ), 'bp_admin_setting_callback_groups_section', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> // Allow subscriptions setting
</span><del>- add_settings_field( '_bp_group_creation', __( 'Group Creation', 'buddypress' ), 'bp_admin_setting_callback_group_creation', 'buddypress', 'bp_groups' );
- register_setting ( 'buddypress', '_bp_group_creation', 'intval' );
</del><ins>+ add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation', 'buddypress' ), 'bp_admin_setting_callback_group_creation', 'buddypress', 'bp_groups' );
+ register_setting ( 'buddypress', 'bp_restrict_group_creation', 'intval' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Forums ************************************************************/
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (6066 => 6067)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2012-06-08 21:44:34 UTC (rev 6066)
+++ trunk/bp-loader.php 2012-06-08 21:52:38 UTC (rev 6067)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * @var int Database version of current BuddyPress files
</span><span class="cx"> */
</span><del>- public $db_version = 5251;
</del><ins>+ public $db_version = 6066;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @var int Database version raw from database connection
</span></span></pre>
</div>
</div>
</body>
</html>