<!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][4794] trunk/bp-core/admin: Cleans up require()s in BP installation process.</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/4794">4794</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-22 13:45:08 +0000 (Fri, 22 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleans up require()s in BP installation process. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3369">#3369</a>. See <a href="http://buddypress.trac.wordpress.org/ticket/3367">#3367</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreschemaphp">trunk/bp-core/admin/bp-core-schema.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (4793 => 4794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-07-22 13:32:14 UTC (rev 4793)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-07-22 13:45:08 UTC (rev 4794)
</span><span class="lines">@@ -328,8 +328,10 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_admin_component_options() {
</span><span class="cx"> global $bp_wizard;
</span><del>-
- require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
</del><ins>+
+ // Load core functions, if needed
+ if ( !function_exists( 'bp_get_option' ) )
+ require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
</ins><span class="cx">
</span><span class="cx"> $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-schema.php (4793 => 4794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-schema.php 2011-07-22 13:32:14 UTC (rev 4793)
+++ trunk/bp-core/admin/bp-core-schema.php 2011-07-22 13:45:08 UTC (rev 4794)
</span><span class="lines">@@ -1,10 +1,9 @@
</span><span class="cx"> <?php
</span><del>-require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
-
</del><ins>+
</ins><span class="cx"> function bp_core_set_charset() {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- require( ABSPATH . 'wp-admin/includes/upgrade.php' );
</del><ins>+ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</ins><span class="cx">
</span><span class="cx"> /* BuddyPress component DB schema */
</span><span class="cx"> if ( !empty($wpdb->charset) )
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (4793 => 4794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-07-22 13:32:14 UTC (rev 4793)
+++ trunk/bp-core/admin/bp-core-update.php 2011-07-22 13:45:08 UTC (rev 4794)
</span><span class="lines">@@ -16,8 +16,9 @@
</span><span class="cx"> function __construct() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- // Ensure that we have access to some utility functions
- require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
</del><ins>+ // Ensure that we have access to some utility functions. Must use require_once()
+ // because BP Core is loaded during incremental upgrades
+ require_once( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
</ins><span class="cx">
</span><span class="cx"> // Get current DB version
</span><span class="cx"> $this->database_version = !empty( $bp->database_version ) ? (int) $bp->database_version : 0;
</span><span class="lines">@@ -584,7 +585,6 @@
</span><span class="cx"> if ( !current_user_can( 'activate_plugins' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- require( ABSPATH . WPINC . '/plugin.php' );
</del><span class="cx"> $installed_plugins = get_plugins();
</span><span class="cx"> $installed_themes = get_themes();
</span><span class="cx">
</span><span class="lines">@@ -1018,7 +1018,6 @@
</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>- require( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
</del><span class="cx"> require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
</span><span class="cx"> bp_core_add_admin_menu();
</span><span class="cx">
</span><span class="lines">@@ -1260,9 +1259,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @return array $page_ids
</span><span class="cx"> */
</span><del>-function bp_core_update_get_page_meta() {
- require( BP_PLUGIN_DIR . '/bp-core/bp-core-functions.php' );
-
</del><ins>+function bp_core_update_get_page_meta() {
</ins><span class="cx"> if ( !$page_ids = bp_get_option( 'bp-pages' ) )
</span><span class="cx"> $page_ids = array();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>