<!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][6105] trunk/bp-core/admin/bp-core-update.php: Update the updater to better handle switching from BP 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/6105">6105</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-06-17 20:43:45 +0000 (Sun, 17 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update the updater to better handle switching from BP 1.5 to 1.6. See <a href="http://buddypress.trac.wordpress.org/ticket/4005">#4005</a>.
Fixes a problem where after completing the DB update screen, all of the 'new
install' tabs were shown instead only the tabs relevant to the update.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (6104 => 6105)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-06-17 19:59:21 UTC (rev 6104)
+++ trunk/bp-core/admin/bp-core-update.php 2012-06-17 20:43:45 UTC (rev 6105)
</span><span class="lines">@@ -64,10 +64,6 @@
</span><span class="cx"> // This is an update to an existing install
</span><span class="cx"> } else {
</span><span class="cx">
</span><del>- if ( bp_get_db_version_raw() < (int) bp_get_db_version() ) {
- $steps[] = __( 'Database Update', 'buddypress' );
- }
-
</del><span class="cx"> // New for BP 1.5
</span><span class="cx"> if ( bp_get_db_version_raw() < 1801 || !bp_core_get_directory_page_ids() ) {
</span><span class="cx"> $steps[] = __( 'Components', 'buddypress' );
</span><span class="lines">@@ -75,10 +71,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // New for BP 1.6
</span><del>- if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) ) {
</del><ins>+ if ( bp_get_db_version_raw() < 5222 && !defined( 'BP_USE_WP_ADMIN_BAR' ) )
</ins><span class="cx"> $steps[] = __( 'Toolbar', 'buddypress' );
</span><del>- }
</del><span class="cx">
</span><ins>+ if ( bp_get_db_version_raw() < (int) bp_get_db_version() )
+ $steps[] = __( 'Database Update', 'buddypress' );
+
</ins><span class="cx"> $steps[] = __( 'Finish', 'buddypress' );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -237,7 +235,7 @@
</span><span class="cx"> function step_db_update() {
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <p><?php _e( 'Before you can continue using BuddyPress, a few minor adjustments need to be made. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( 'To complete the update, a few changes need to be made to your database. These changes are not destructive and will not remove or change any existing settings.', 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <div class="submit clear">
</span><span class="cx"> <input type="hidden" name="save" value="db_update" />
</span><span class="lines">@@ -660,7 +658,7 @@
</span><span class="cx"> function step_admin_bar() {
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <p><?php _e( "BuddyPress now uses WordPress' Toolbar; this sits at the top of your site and contains various links to useful admin screens. We've turbo-charged the Toolbar by adding social items to help your users explore your site, and manage their content.", 'buddypress' ); ?></p>
</del><ins>+ <p><?php _e( "BuddyPress now uses the WordPress Toolbar; we've turbo-charged it by adding social items to help your users explore your site and manage their content.", 'buddypress' ); ?></p>
</ins><span class="cx">
</span><span class="cx"> <p><?php _e( "We've noticed that your site uses the old bar from earlier versions of BuddyPress.", 'buddypress' ); ?></p>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>