<!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] [1741] trunk/bp-core/bp-core-catchuri.php:
Backwards compat support for the new members slug settings.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1741</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-31 18:49:39 +0000 (Mon, 31 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Backwards compat support for the new members slug settings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (1740 => 1741)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2009-08-31 17:59:26 UTC (rev 1740)
+++ trunk/bp-core/bp-core-catchuri.php 2009-08-31 18:49:39 UTC (rev 1741)
</span><span class="lines">@@ -96,13 +96,16 @@
</span><span class="cx"> /* Reset the keys by merging with an empty array */
</span><span class="cx"> $bp_uri = array_merge( array(), $bp_uri );
</span><span class="cx"> $bp_unfiltered_uri = $bp_uri;
</span><ins>+
+ /* If we are under anything with a members slug, set the correct globals */
+ if ( $bp_uri[0] == BP_MEMBERS_SLUG ) {
+ $is_member_page = true;
+ $is_root_component = true;
+ }
</ins><span class="cx">
</span><span class="cx"> /* Catch a member page and set the current member ID */
</span><span class="cx"> if ( !defined( 'BP_ENABLE_ROOT_PROFILES' ) ) {
</span><del>- if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {
- $is_member_page = true;
- $is_root_component = true;
-
</del><ins>+ if ( ( $bp_uri[0] == BP_MEMBERS_SLUG && !empty( $bp_uri[1] ) ) || in_array( 'wp-load.php', $bp_uri ) ) {
</ins><span class="cx"> // We are within a member page, set up user id globals
</span><span class="cx"> $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[1] );
</span><span class="cx">
</span><span class="lines">@@ -116,7 +119,7 @@
</span><span class="cx"> if ( get_userdatabylogin( $bp_uri[0] ) || in_array( 'wp-load.php', $bp_uri ) ) {
</span><span class="cx"> $is_member_page = true;
</span><span class="cx"> $is_root_component = true;
</span><del>-
</del><ins>+
</ins><span class="cx"> // We are within a member page, set up user id globals
</span><span class="cx"> $displayed_user_id = bp_core_get_displayed_userid( $bp_uri[0] );
</span><span class="cx">
</span><span class="lines">@@ -127,6 +130,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if ( !isset($is_root_component) )
</span><span class="cx"> $is_root_component = in_array( $bp_uri[0], $bp->root_components );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>