<!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][3991] trunk: bp-active-components clean-up surrounding the XProfile component.</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>3991</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-02 01:51:18 +0000 (Wed, 02 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>bp-active-components clean-up surrounding the XProfile component.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpcorebpcorecomponentphp">trunk/bp-core/bp-core-component.php</a></li>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpmembersbpmembersloaderphp">trunk/bp-members/bp-members-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (3990 => 3991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2011-02-02 01:30:37 UTC (rev 3990)
+++ trunk/bp-activity/bp-activity-classes.php 2011-02-02 01:51:18 UTC (rev 3991)
</span><span class="lines">@@ -362,12 +362,15 @@
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$comments = wp_cache_get( 'bp_activity_comments_' . $activity_id ) ) {
</span><del>- // Select the user's fullname with the query so we don't have to
- // fetch it for each comment
</del><ins>+ // Select the user's fullname with the query
</ins><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><span class="cx"> $fullname_select = ", pd.value as user_fullname";
</span><span class="cx"> $fullname_from = ", {$bp->profile->table_name_data} pd ";
</span><span class="cx"> $fullname_where = "AND pd.user_id = a.user_id AND pd.field_id = 1";
</span><ins>+
+ // Prevent debug errors
+ } else {
+ $fullname_select = $fullname_from = $fullname_where = '';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Retrieve all descendants of the $root node
</span></span></pre></div>
<a id="trunkbpcorebpcorecomponentphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-component.php (3990 => 3991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-component.php 2011-02-02 01:30:37 UTC (rev 3990)
+++ trunk/bp-core/bp-core-component.php 2011-02-02 01:51:18 UTC (rev 3991)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> /** BuddyPress ********************************************************/
</span><span class="cx">
</span><span class="cx"> // Register this component in the active components array
</span><del>- $bp->active_components[$this->slug] = $this->id;
</del><ins>+ $bp->loaded_components[$this->slug] = $this->id;
</ins><span class="cx">
</span><span class="cx"> // Call action
</span><span class="cx"> do_action( 'bp_' . $this->id . '_setup_globals' );
</span></span></pre></div>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (3990 => 3991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2011-02-02 01:30:37 UTC (rev 3990)
+++ trunk/bp-core/bp-core-loader.php 2011-02-02 01:51:18 UTC (rev 3991)
</span><span class="lines">@@ -61,17 +61,6 @@
</span><span class="cx"> // display custom navigation for an item (for example a group)
</span><span class="cx"> $bp->is_single_item = false;
</span><span class="cx">
</span><del>- // The default component to use if none are set and someone
- // visits: http://domain.com/members/andy
- if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
- if ( isset( $bp->pages->activity ) )
- $bp->default_component = $bp->activity->id;
- else
- $bp->default_component = $bp->profile->id;
- } else {
- $bp->default_component = BP_DEFAULT_COMPONENT;
- }
-
</del><span class="cx"> // Sets up the array container for the component navigation rendered
</span><span class="cx"> // by bp_get_nav()
</span><span class="cx"> $bp->bp_nav = array();
</span><span class="lines">@@ -82,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> // Contains an array of all the active components. The key is the slug,
</span><span class="cx"> // value the internal ID of the component.
</span><del>- $bp->active_components = array();
</del><ins>+ //$bp->active_components = array();
</ins><span class="cx">
</span><span class="cx"> /** Basic current user data *******************************************/
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (3990 => 3991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php 2011-02-02 01:30:37 UTC (rev 3990)
+++ trunk/bp-members/bp-members-loader.php 2011-02-02 01:51:18 UTC (rev 3991)
</span><span class="lines">@@ -112,10 +112,22 @@
</span><span class="cx"> // Fetch the full name displayed user
</span><span class="cx"> $bp->displayed_user->fullname = bp_core_get_user_displayname( $bp->displayed_user->id );
</span><span class="cx">
</span><ins>+ /** Profiles Fallback *************************************************/
+ if ( !bp_is_active( 'xprofile' ) )
+ $bp->profile->slug = 'profile';
+
</ins><span class="cx"> /** Default Profile Component *****************************************/
</span><ins>+ if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
+ if ( isset( $bp->pages->activity ) )
+ $bp->default_component = $bp->activity->id;
+ else
+ $bp->default_component = $bp->profile->id;
+ } else {
+ $bp->default_component = BP_DEFAULT_COMPONENT;
+ }
+
</ins><span class="cx"> if ( !$bp->current_component && $bp->displayed_user->id )
</span><span class="cx"> $bp->current_component = $bp->default_component;
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>