<!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][4293] trunk/bp-core/admin/bp-core-update.php: Revert r4292:4290.</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>4293</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-25 10:25:17 +0000 (Mon, 25 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert r4292:4290. See #3178</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 (4292 => 4293)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-04-25 10:00:40 UTC (rev 4292)
+++ trunk/bp-core/admin/bp-core-update.php 2011-04-25 10:25:17 UTC (rev 4293)
</span><span class="lines">@@ -66,14 +66,6 @@
</span><span class="cx"> __( 'Finish', 'buddypress' )
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Only show permalinks panel if we don't already use them
- if ( !empty( $wp_rewrite->permalink_structure ) ) {
- unset( $steps[2] );
-
- // Reset the keys by merging with an empty array
- $steps = array_merge( array(), $steps );
- }
-
</del><span class="cx"> // Update wizard steps
</span><span class="cx"> } else {
</span><span class="cx"> if ( $this->is_network_activate )
</span><span class="lines">@@ -270,8 +262,8 @@
</span><span class="cx"> $blogs_slug = constant( 'BP_BLOGS_SLUG' );
</span><span class="cx"> else
</span><span class="cx"> $blogs_slug = 'blogs';
</span><del>-
- // Call up old bp-pages to see if a page has been previously linked to Blogs
</del><ins>+
+ // Call up old bp-pages to see if a page has been previously linked to Blogs
</ins><span class="cx"> $page_blog_id = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
</span><span class="cx"> $existing_pages_data = get_blog_option( $page_blog_id, 'bp-pages' );
</span><span class="cx"> $existing_pages = $existing_pages_data[$page_blog_id];
</span><span class="lines">@@ -781,10 +773,10 @@
</span><span class="cx"> $page_blog_id = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
</span><span class="cx"> $existing_pages_data = get_blog_option( $page_blog_id, 'bp-pages' );
</span><span class="cx"> $existing_pages = $existing_pages_data[$page_blog_id];
</span><del>-
</del><ins>+
</ins><span class="cx"> $bp_pages = $this->setup_pages( (array)$_POST['bp_pages'] );
</span><span class="cx"> $bp_pages = array_merge( (array)$existing_pages, (array)$bp_pages );
</span><del>-
</del><ins>+
</ins><span class="cx"> $existing_pages_data[$page_blog_id] = $bp_pages;
</span><span class="cx">
</span><span class="cx"> update_site_option( 'bp-pages', $existing_pages_data );
</span><span class="lines">@@ -1014,7 +1006,7 @@
</span><span class="cx"> // Delete the setup cookie
</span><span class="cx"> @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
</span><span class="cx">
</span><del>- // Load BP, so that the redirect is successful
</del><ins>+ // Load BP, so that the redirect is successful
</ins><span class="cx"> require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Redirect to the BuddyPress dashboard
</span><span class="lines">@@ -1078,7 +1070,7 @@
</span><span class="cx"> $active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
</span><span class="cx">
</span><span class="cx"> require_once( dirname( __FILE__ ) . '/bp-core-schema.php' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Core DB Tables
</span><span class="cx"> bp_core_install_notifications();
</span><span class="cx">
</span><span class="lines">@@ -1291,13 +1283,13 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_update_get_page_meta() {
</span><span class="cx"> $page_ids = get_site_option( 'bp-pages' );
</span><del>-
</del><ins>+
</ins><span class="cx"> $is_enable_multiblog = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? true : false;
</span><span class="cx">
</span><span class="cx"> $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : BP_ROOT_BLOG;
</span><del>-
</del><ins>+
</ins><span class="cx"> $blog_page_ids = !empty( $page_ids[$page_blog_id] ) ? $page_ids[$page_blog_id] : false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_update_get_page_meta', $blog_page_ids );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>