<!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][3998] trunk/bp-core/bp-core-loader.php: More deactivated_component backwards compatibility fixes</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>3998</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-02 05:51:34 +0000 (Wed, 02 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More deactivated_component backwards compatibility fixes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (3997 => 3998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2011-02-02 05:37:39 UTC (rev 3997)
+++ trunk/bp-core/bp-core-loader.php 2011-02-02 05:51:34 UTC (rev 3998)
</span><span class="lines">@@ -57,21 +57,33 @@
</span><span class="cx"> $bp->required_components = apply_filters( 'bp_required_components', array( 'members', ) );
</span><span class="cx">
</span><span class="cx"> // Get a list of activated components
</span><del>- if ( $activated_components = get_site_option( 'bp-active-components' ) ) {
- $bp->active_components = apply_filters( 'bp_active_components', $activated_components );
- $bp->deactivated_components = apply_filters( 'bp_deactivated_components', array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_keys( $bp->active_components ) ) );
</del><ins>+ if ( $active_components = get_site_option( 'bp-active-components' ) ) {
+ $bp->active_components = apply_filters( 'bp_active_components', $active_components );
+ $bp->deactivated_components = apply_filters( 'bp_deactivated_components', array_values( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_keys( $bp->active_components ) ) ) );
</ins><span class="cx">
</span><del>- // Backwards compatibility
</del><ins>+ // Pre 1.3 Backwards compatibility
</ins><span class="cx"> } elseif ( $deactivated_components = get_site_option( 'bp-deactivated-components' ) ) {
</span><del>- foreach ( $deactivated_components as $name => $value )
- $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $name ) );
</del><ins>+ // Trim off namespace and filename
+ foreach ( $deactivated_components as $component => $value )
+ $trimmed[] = str_replace( '.php', '', str_replace( 'bp-', '', $component ) );
+
+ // Set globals
</ins><span class="cx"> $bp->deactivated_components = apply_filters( 'bp_deactivated_components', $trimmed );
</span><del>- $bp->active_components = apply_filters( 'bp_active_components', array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $bp->deactivated_components ) ) );
</del><ins>+
+ // Setup the active components
+ $active_components = array_flip( array_diff( array_values( array_merge( $bp->optional_components, $bp->required_components ) ), array_values( $bp->deactivated_components ) ) );
+
+ // Loop through active components and set the values
+ foreach( $active_components as $component => $value )
+ $bp->active_components[$component] = 1;
+
+ // Set the active component global
+ $bp->active_components = apply_filters( 'bp_active_components', $bp->active_components );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Loop through optional components
</span><span class="cx"> foreach( $bp->optional_components as $component )
</span><del>- if ( bp_is_active( $component) && file_exists( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
</del><ins>+ if ( bp_is_active( $component ) && file_exists( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' ) )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-' . $component . '/bp-' . $component . '-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Loop through required components
</span></span></pre>
</div>
</div>
</body>
</html>