<!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][5656] trunk: Reconfigures require() order for loading process during installation and upgrade.</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/5656">5656</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-01-27 21:15:28 +0000 (Fri, 27 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reconfigures require() order for loading process during installation and upgrade.
Corrects outdated function calls and path names in installation wizard.
See <a href="http://buddypress.trac.wordpress.org/ticket/3740">#3740</a>.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3875">#3875</a>. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3802">#3802</a>. See <a href="http://buddypress.trac.wordpress.org/ticket/3865">#3865</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5655 => 5656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2012-01-27 21:15:23 UTC (rev 5655)
+++ trunk/bp-core/admin/bp-core-update.php 2012-01-27 21:15:28 UTC (rev 5656)
</span><span class="lines">@@ -1154,11 +1154,9 @@
</span><span class="cx"> @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
</span><span class="cx">
</span><span class="cx"> // Load BP and hook the admin menu, so that the redirect is successful
</span><del>- if ( !function_exists( 'bp_core_update_message' ) )
- require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
</del><ins>+ require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-admin.php' );
+ bp_admin();
</ins><span class="cx">
</span><del>- bp_core_add_admin_menu();
-
</del><span class="cx"> // Redirect to the BuddyPress dashboard
</span><span class="cx"> $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-components' ), network_admin_url( 'settings.php' ) ) : add_query_arg( array( 'page' => 'bp-components' ), admin_url( 'options-general.php' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (5655 => 5656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2012-01-27 21:15:23 UTC (rev 5655)
+++ trunk/bp-core/bp-core-admin.php 2012-01-27 21:15:28 UTC (rev 5656)
</span><span class="lines">@@ -130,10 +130,10 @@
</span><span class="cx"> private function includes() {
</span><span class="cx">
</span><span class="cx"> // Include the files
</span><del>- require( $this->admin_dir . 'bp-core-settings.php' );
- require( $this->admin_dir . 'bp-core-functions.php' );
- require( $this->admin_dir . 'bp-core-components.php' );
- require( $this->admin_dir . 'bp-core-slugs.php' );
</del><ins>+ require_once( $this->admin_dir . 'bp-core-settings.php' );
+ require_once( $this->admin_dir . 'bp-core-functions.php' );
+ require_once( $this->admin_dir . 'bp-core-components.php' );
+ require_once( $this->admin_dir . 'bp-core-slugs.php' );
</ins><span class="cx"> //require( $this->admin_dir . 'bp-metaboxes.php' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (5655 => 5656)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2012-01-27 21:15:23 UTC (rev 5655)
+++ trunk/bp-loader.php 2012-01-27 21:15:28 UTC (rev 5656)
</span><span class="lines">@@ -446,37 +446,17 @@
</span><span class="cx"> if ( is_multisite() && ( empty( $versions['1.5-multi'] ) && empty( $versions['1.6-multi'] ) ) )
</span><span class="cx"> $this->is_network_activate = true;
</span><span class="cx">
</span><del>- // Require all of the BuddyPress core libraries
- require( $this->plugin_dir . 'bp-core/bp-core-caps.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-cache.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-hooks.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-update.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-options.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-classes.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-filters.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-avatars.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-widgets.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-template.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-component.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
- require( $this->plugin_dir . 'bp-core/bp-core-loader.php' );
-
- // Skip or load deprecated content
- if ( false !== $this->load_deprecated ) {
- require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
- require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
- }
-
</del><span class="cx"> /** Update/Install ****************************************************/
</span><span class="cx">
</span><span class="cx"> // This is a new installation
</span><span class="cx"> if ( empty( $this->db_version_raw ) ) {
</span><span class="cx"> $this->maintenance_mode = 'install';
</span><ins>+
+ // The installation process requires a few BuddyPress core libraries
+ require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-update.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-caps.php' );
+
</ins><span class="cx"> require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
</span><span class="cx">
</span><span class="cx"> // There is a previous installation
</span><span class="lines">@@ -484,6 +464,32 @@
</span><span class="cx">
</span><span class="cx"> // Setup the BuddyPress theme directory
</span><span class="cx"> register_theme_directory( $this->themes_dir );
</span><ins>+
+ // Require all of the BuddyPress core libraries
+ require( $this->plugin_dir . 'bp-core/bp-core-caps.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-cache.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-hooks.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-update.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-options.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-classes.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-filters.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-avatars.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-widgets.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-template.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-component.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
+ require( $this->plugin_dir . 'bp-core/bp-core-loader.php' );
+
+ // Skip or load deprecated content
+ if ( false !== $this->load_deprecated ) {
+ require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
+ require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
+ }
</ins><span class="cx">
</span><span class="cx"> // Check if an update is required
</span><span class="cx"> if ( ( (int) $this->db_version_raw < (int) $this->db_version ) || ( !empty( $this->is_network_activate ) ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>