<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2844] trunk/bp-loader.php:
Reverting new upgrade code as it is not ready for use yet.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2844</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-12 13:34:21 +0000 (Fri, 12 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reverting new upgrade code as it is not ready for use yet. This was committed with the previous branch merge by mistake.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (2843 => 2844)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2010-03-12 13:07:15 UTC (rev 2843)
+++ trunk/bp-loader.php 2010-03-12 13:34:21 UTC (rev 2844)
</span><span class="lines">@@ -12,60 +12,48 @@
</span><span class="cx"> define( 'BP_VERSION', '1.2.2' );
</span><span class="cx">
</span><span class="cx"> /***
</span><del>- * Check if this is the first time BuddyPress has been loaded, or the first time
- * since an upgrade. If so, load the install/upgrade routine only.
</del><ins>+ * This file will load in each BuddyPress component based on which
+ * of the components have been activated on the "BuddyPress" admin menu.
</ins><span class="cx"> */
</span><del>-if ( get_site_option( 'bp-db-version' ) < 1210 ) {
- require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-upgrade.php' );
</del><span class="cx">
</span><del>-/***
- * If the install or upgrade routine is completed and everything is up to date
- * continue loading BuddyPress as normal.
- */
-} else {
- /***
- * This file will load in each BuddyPress component based on which
- * of the components have been activated on the "BuddyPress" admin menu.
- */
- require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
- $bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
</del><ins>+require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
+$bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
</ins><span class="cx">
</span><del>- do_action( 'bp_core_loaded' );
</del><ins>+do_action( 'bp_core_loaded' );
</ins><span class="cx">
</span><del>- /* Activity Streams */
- if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
- include( BP_PLUGIN_DIR . '/bp-activity.php' );
</del><ins>+/* Activity Streams */
+if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
+ include( BP_PLUGIN_DIR . '/bp-activity.php' );
</ins><span class="cx">
</span><del>- /* Blog Tracking */
- if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
- include( BP_PLUGIN_DIR . '/bp-blogs.php' );
</del><ins>+/* Blog Tracking */
+if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
+ include( BP_PLUGIN_DIR . '/bp-blogs.php' );
</ins><span class="cx">
</span><del>- /* bbPress Forum Integration */
- if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
- include( BP_PLUGIN_DIR . '/bp-forums.php' );
</del><ins>+/* bbPress Forum Integration */
+if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
+ include( BP_PLUGIN_DIR . '/bp-forums.php' );
</ins><span class="cx">
</span><del>- /* Friend Connections */
- if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
- include( BP_PLUGIN_DIR . '/bp-friends.php' );
</del><ins>+/* Friend Connections */
+if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
+ include( BP_PLUGIN_DIR . '/bp-friends.php' );
</ins><span class="cx">
</span><del>- /* Groups Support */
- if ( !isset( $bp_deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
- include( BP_PLUGIN_DIR . '/bp-groups.php' );
</del><ins>+/* Groups Support */
+if ( !isset( $bp_deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
+ include( BP_PLUGIN_DIR . '/bp-groups.php' );
</ins><span class="cx">
</span><del>- /* Private Messaging */
- if ( !isset( $bp_deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
- include( BP_PLUGIN_DIR . '/bp-messages.php' );
</del><ins>+/* Private Messaging */
+if ( !isset( $bp_deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
+ include( BP_PLUGIN_DIR . '/bp-messages.php' );
</ins><span class="cx">
</span><del>- /* Extended Profiles */
- if ( !isset( $bp_deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
- include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
</del><ins>+/* Extended Profiles */
+if ( !isset( $bp_deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
+ include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
</ins><span class="cx">
</span><del>- /* Allow dependent plugins to hook into BuddyPress in a safe way */
- function bp_loaded() {
- do_action( 'bp_init' );
- }
- add_action( 'plugins_loaded', 'bp_loaded' );
</del><ins>+/* Allow dependent plugins to hook into BuddyPress in a safe way */
+function bp_loaded() {
+ do_action( 'bp_init' );
</ins><span class="cx"> }
</span><ins>+add_action( 'plugins_loaded', 'bp_loaded' );
</ins><span class="cx">
</span><span class="cx"> /* Activation Function */
</span><span class="cx"> function bp_loader_activate() {
</span></span></pre>
</div>
</div>
</body>
</html>