<!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][3815] trunk/bp-core/bp-core-catchuri.php: Assign global values early and use through-out bp_core_set_uri_globals.</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>3815</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-22 13:42:34 +0000 (Sat, 22 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Assign global values early and use through-out bp_core_set_uri_globals. Fixes regression from previous commits.</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 (3814 => 3815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-01-22 13:35:54 UTC (rev 3814)
+++ trunk/bp-core/bp-core-catchuri.php 2011-01-22 13:42:34 UTC (rev 3815)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> global $bp_unfiltered_uri, $bp_unfiltered_uri_offset;
</span><span class="cx"> global $current_blog;
</span><span class="cx">
</span><del>- $current_component = '';
</del><ins>+ // Create global component, action, and item variables
+ $bp->current_component = $bp->current_action = $bp->action_variables = $bp->current_item = '';
</ins><span class="cx">
</span><span class="cx"> if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
</span><span class="cx"> // Only catch URI's on the root blog if we are not running
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx"> $path = $noget;
</span><span class="cx">
</span><span class="cx"> // Fetch the current URI and explode each part separated by '/' into an array
</span><del>- $bp_uri = explode( "/", $path );
</del><ins>+ $bp_uri = explode( '/', $path );
</ins><span class="cx">
</span><span class="cx"> // Loop and remove empties
</span><span class="cx"> foreach ( (array)$bp_uri as $key => $uri_chunk )
</span><span class="lines">@@ -146,13 +147,8 @@
</span><span class="cx"> $matches[] = 1;
</span><span class="cx">
</span><span class="cx"> // This is not a BuddyPress page, so just return.
</span><del>- if ( !isset( $matches ) ) {
- $bp->current_component = $current_component;
- $bp->current_action = '';
- $bp->action_variables = '';
- $bp->current_item = '';
</del><ins>+ if ( !isset( $matches ) )
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // Find the offset
</span><span class="cx"> $uri_offset = 0;
</span><span class="lines">@@ -167,7 +163,7 @@
</span><span class="cx"> $bp_unfiltered_uri_offset = $uri_offset;
</span><span class="cx">
</span><span class="cx"> // This is a members page so lets check if we have a displayed member
</span><del>- if ( isset( $match ) && 'members' == $match->key ) {
</del><ins>+ if ( isset( $match->key ) && 'members' == $match->key ) {
</ins><span class="cx"> if ( !empty( $bp_uri[$uri_offset + 1] ) ) {
</span><span class="cx"> if ( defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) )
</span><span class="cx"> $bp->displayed_user->id = (int) bp_core_get_userid( urldecode( $bp_uri[$uri_offset + 1] ) );
</span><span class="lines">@@ -180,7 +176,7 @@
</span><span class="cx"> for ( $i = 0; $i < $uri_offset; $i++ )
</span><span class="cx"> unset( $bp_uri[$i] );
</span><span class="cx">
</span><del>- $current_component = isset( $bp_uri[$uri_offset] ) ? $bp_uri[$uri_offset] : '';
</del><ins>+ $bp->current_component = isset( $bp_uri[$uri_offset] ) ? $bp_uri[$uri_offset] : '';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,24 +184,21 @@
</span><span class="cx"> $bp_uri = array_merge( array(), $bp_uri );
</span><span class="cx">
</span><span class="cx"> // Set the current component
</span><del>- if ( empty( $current_component ) ) {
</del><ins>+ if ( empty( $bp->current_component ) ) {
</ins><span class="cx"> for ( $i = 0; $i <= $uri_offset; $i++ ) {
</span><span class="cx"> if ( !empty( $bp_uri[$i] ) ) {
</span><del>- $current_component .= $bp_uri[$i];
</del><ins>+ $bp->current_component .= $bp_uri[$i];
</ins><span class="cx">
</span><span class="cx"> if ( $i != $uri_offset )
</span><del>- $current_component .= '/';
</del><ins>+ $bp->current_component .= '/';
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> $i = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Set the current component in the global
- $bp->current_component = $current_component;
-
</del><span class="cx"> // Set the current action
</span><del>- $bp->current_action = isset( $bp_uri[$i] ) ? $bp_uri[$i] : '';
</del><ins>+ $bp->current_action = isset( $bp_uri[$i] ) ? $bp_uri[$i] : '';
</ins><span class="cx">
</span><span class="cx"> // Unset the current_component and action from action_variables
</span><span class="cx"> for ( $j = 0; $j <= $i; $j++ )
</span><span class="lines">@@ -220,9 +213,6 @@
</span><span class="cx">
</span><span class="cx"> // Reset the keys by merging with an empty array
</span><span class="cx"> $bp->action_variables = array_merge( array(), $bp->action_variables );
</span><del>-
- // Set the current item to empty
- $bp->current_item = '';
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>