<!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][3983] trunk: Use bp_current_item() in place of $bp->current_item global</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>3983</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-01 19:53:50 +0000 (Tue, 01 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use bp_current_item() in place of $bp->current_item global</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.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 (3982 => 3983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-02-01 19:46:50 UTC (rev 3982)
+++ trunk/bp-core/bp-core-template.php 2011-02-01 19:53:50 UTC (rev 3983)
</span><span class="lines">@@ -542,17 +542,20 @@
</span><span class="cx">
</span><span class="cx"> function bp_current_action() {
</span><span class="cx"> global $bp;
</span><del>- return apply_filters( 'bp_current_action', $bp->current_action );
</del><ins>+ $current_action = !empty( $bp->current_action ) ? $bp->current_action : false;
+ return apply_filters( 'bp_current_action', $current_action );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_current_item() {
</span><span class="cx"> global $bp;
</span><del>- return apply_filters( 'bp_current_item', $bp->current_item );
</del><ins>+ $current_item = !empty( $bp->current_item ) ? $bp->current_item : false;
+ return apply_filters( 'bp_current_item', $current_item );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_action_variables() {
</span><span class="cx"> global $bp;
</span><del>- return apply_filters( 'bp_action_variables', $bp->action_variables );
</del><ins>+ $action_variables = !empty( $bp->action_variables ) ? $bp->action_variables : false;
+ return apply_filters( 'bp_action_variables', $action_variables );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_root_domain() {
</span><span class="lines">@@ -737,9 +740,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_current_item( $item = '' ) {
</span><del>- global $bp;
-
- if ( $item == $bp->current_item )
</del><ins>+ if ( !empty( $item ) && $item == bp_current_item() )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (3982 => 3983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2011-02-01 19:46:50 UTC (rev 3982)
+++ trunk/bp-forums/bp-forums-template.php 2011-02-01 19:53:50 UTC (rev 3983)
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx"> if ( !empty( $forum_template->topic->object_slug ) )
</span><span class="cx"> $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
</span><span class="cx"> else if ( !empty( $bp->is_single_item ) )
</span><del>- $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
</del><ins>+ $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
</ins><span class="cx"> else
</span><span class="cx"> $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_action );
</span><span class="cx">
</span><span class="lines">@@ -1100,7 +1100,7 @@
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $bp->is_single_item )
</span><del>- $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
</del><ins>+ $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
</ins><span class="cx"> else
</span><span class="cx"> $permalink = trailingslashit( bp_get_root_domain() . $bp->current_component . '/' . $bp->current_action );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (3982 => 3983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-02-01 19:46:50 UTC (rev 3982)
+++ trunk/bp-groups/bp-groups-screens.php 2011-02-01 19:53:50 UTC (rev 3983)
</span><span class="lines">@@ -679,7 +679,7 @@
</span><span class="cx">
</span><span class="cx"> // Ask for a login if the user is coming here via an email notification
</span><span class="cx"> if ( !is_user_logged_in() )
</span><del>- bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
</del><ins>+ bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() . '/admin/membership-requests/' ) );
</ins><span class="cx">
</span><span class="cx"> if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
</span><span class="cx"> return false;
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> bp_members_delete_notifications_by_type( $bp->loggedin_user->id, $bp->groups->id, 'new_membership_request' );
</span><span class="cx">
</span><span class="cx"> $request_action = $bp->action_variables[1];
</span><del>- $membership_id = $bp->action_variables[2];
</del><ins>+ $membership_id = $bp->action_variables[2];
</ins><span class="cx">
</span><span class="cx"> if ( isset($request_action) && isset($membership_id) ) {
</span><span class="cx"> if ( 'accept' == $request_action && is_numeric($membership_id) ) {
</span></span></pre>
</div>
</div>
</body>
</html>