<!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][4882] trunk: Ensures that bp_is_current_component() checks against slugs as well as rot_slugs.</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/4882">4882</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-28 01:42:30 +0000 (Thu, 28 Jul 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ensures that bp_is_current_component() checks against slugs as well as rot_slugs. Sets members default component to activity slug rather than to 'activity'. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3398">#3398</a>, props r-a-y</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.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="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (4881 => 4882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php        2011-07-28 01:30:57 UTC (rev 4881)
+++ trunk/bp-core/bp-core-template.php        2011-07-28 01:42:30 UTC (rev 4882)
</span><span class="lines">@@ -655,7 +655,6 @@
</span><span class="cx">                 $component = 'profile';
</span><span class="cx"> 
</span><span class="cx">         if ( !empty( $bp-&gt;current_component ) ) {
</span><del>-
</del><span class="cx">                 // First, check to see whether $component_name and the current
</span><span class="cx">                 // component are a simple match
</span><span class="cx">                 if ( $bp-&gt;current_component == $component ) {
</span><span class="lines">@@ -666,6 +665,10 @@
</span><span class="cx">                 } elseif ( isset( $bp-&gt;{$component}-&gt;root_slug ) &amp;&amp; $bp-&gt;{$component}-&gt;root_slug == $bp-&gt;current_component ) {
</span><span class="cx">                         $is_current_component = true;
</span><span class="cx"> 
</span><ins>+                // Because slugs can differ from root_slugs, we should check them too
+                } elseif ( isset( $bp-&gt;{$component}-&gt;slug ) &amp;&amp; $bp-&gt;{$component}-&gt;slug == $bp-&gt;current_component ) {
+                        $is_current_component = true;
+                        
</ins><span class="cx">                 // Next, check to see whether $component is a canonical,
</span><span class="cx">                 // non-translatable component name. If so, we can return its
</span><span class="cx">                 // corresponding slug from $bp-&gt;active_components.
</span><span class="lines">@@ -673,8 +676,8 @@
</span><span class="cx">                         if ( strstr( $bp-&gt;current_component, $key ) )
</span><span class="cx">                                 $is_current_component = true;
</span><span class="cx"> 
</span><del>-                // If we haven't found a match yet, check against the root_slugs
-                // created by $bp-&gt;pages
</del><ins>+                // If we haven't found a match yet, check against the root_slugs 
+                // created by $bp-&gt;pages, as well as the regular slugs
</ins><span class="cx">                 } else {
</span><span class="cx">                         foreach ( $bp-&gt;active_components as $key =&gt; $id ) {
</span><span class="cx">                                 // If the $component parameter does not match the current_component,
</span></span></pre></div>
<a id="trunkbpmembersbpmembersloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-loader.php (4881 => 4882)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-loader.php        2011-07-28 01:30:57 UTC (rev 4881)
+++ trunk/bp-members/bp-members-loader.php        2011-07-28 01:42:30 UTC (rev 4882)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">                 /** Default Profile Component *****************************************/
</span><span class="cx">                 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
</span><span class="cx">                         if ( bp_is_active( 'activity' ) &amp;&amp; isset( $bp-&gt;pages-&gt;activity ) )
</span><del>-                                $bp-&gt;default_component = $bp-&gt;activity-&gt;id;
</del><ins>+                                $bp-&gt;default_component = bp_get_activity_slug();
</ins><span class="cx">                         else
</span><span class="cx">                                 $bp-&gt;default_component = ( 'xprofile' == $bp-&gt;profile-&gt;id ) ? 'profile' : $bp-&gt;profile-&gt;id;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>