<!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][4847] trunk: Global/slug audit in Core and Activity components.</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/4847">4847</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-25 00:29:19 +0000 (Mon, 25 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Global/slug audit in Core and Activity components. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3325">#3325</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityactionsphp">trunk/bp-activity/bp-activity-actions.php</a></li>
<li><a href="#trunkbpactivitybpactivityscreensphp">trunk/bp-activity/bp-activity-screens.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-actions.php (4846 => 4847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-actions.php 2011-07-25 00:21:20 UTC (rev 4846)
+++ trunk/bp-activity/bp-activity-actions.php 2011-07-25 00:29:19 UTC (rev 4847)
</span><span class="lines">@@ -22,11 +22,11 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // No activity to display
</span><del>- if ( empty( $bp->action_variables[0] ) || !is_numeric( $bp->action_variables[0] ) )
</del><ins>+ if ( !bp_action_variable( 0 ) || !is_numeric( bp_action_variable( 0 ) ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Get the activity details
</span><del>- $activity = bp_activity_get_specific( array( 'activity_ids' => $bp->action_variables[0], 'show_hidden' => true ) );
</del><ins>+ $activity = bp_activity_get_specific( array( 'activity_ids' => bp_action_variable( 0 ), 'show_hidden' => true ) );
</ins><span class="cx">
</span><span class="cx"> // 404 if activity does not exist
</span><span class="cx"> if ( empty( $activity['activities'][0] ) ) {
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> if ( !bp_is_activity_component() || !bp_is_current_action( 'delete' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( empty( $activity_id ) && !empty( $bp->action_variables[0] ) && is_numeric( $bp->action_variables[0] ) )
- $activity_id = (int) $bp->action_variables[0];
</del><ins>+ if ( empty( $activity_id ) && bp_action_variable( 0 ) )
+ $activity_id = (int) bp_action_variable( 0 );
</ins><span class="cx">
</span><span class="cx"> // Not viewing a specific activity item
</span><span class="cx"> if ( empty( $activity_id ) )
</span><span class="lines">@@ -211,12 +211,12 @@
</span><span class="cx"> // Check the nonce
</span><span class="cx"> check_admin_referer( 'mark_favorite' );
</span><span class="cx">
</span><del>- if ( bp_activity_add_user_favorite( $bp->action_variables[0] ) )
</del><ins>+ if ( bp_activity_add_user_favorite( bp_action_variable( 0 ) ) )
</ins><span class="cx"> bp_core_add_message( __( 'Activity marked as favorite.', 'buddypress' ) );
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __( 'There was an error marking that activity as a favorite, please try again.', 'buddypress' ), 'error' );
</span><span class="cx">
</span><del>- bp_core_redirect( wp_get_referer() . '#activity-' . $bp->action_variables[0] );
</del><ins>+ bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_mark_favorite' );
</span><span class="cx">
</span><span class="lines">@@ -229,12 +229,12 @@
</span><span class="cx"> // Check the nonce
</span><span class="cx"> check_admin_referer( 'unmark_favorite' );
</span><span class="cx">
</span><del>- if ( bp_activity_remove_user_favorite( $bp->action_variables[0] ) )
</del><ins>+ if ( bp_activity_remove_user_favorite( bp_action_variable( 0 ) ) )
</ins><span class="cx"> bp_core_add_message( __( 'Activity removed as favorite.', 'buddypress' ) );
</span><span class="cx"> else
</span><span class="cx"> bp_core_add_message( __( 'There was an error removing that activity as a favorite, please try again.', 'buddypress' ), 'error' );
</span><span class="cx">
</span><del>- bp_core_redirect( wp_get_referer() . '#activity-' . $bp->action_variables[0] );
</del><ins>+ bp_core_redirect( wp_get_referer() . '#activity-' . bp_action_variable( 0 ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_actions', 'bp_activity_action_remove_favorite' );
</span><span class="cx">
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> function bp_activity_action_friends_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_active( 'friends' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_friends_slug() ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_active( 'friends' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> function bp_activity_action_my_groups_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_active( 'groups' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_groups_slug() ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_active( 'groups' ) || !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> function bp_activity_action_mentions_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> function bp_activity_action_favorites_feed() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><del>- if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !isset( $bp->action_variables[0] ) || $bp->action_variables[0] != 'feed' )
</del><ins>+ if ( !bp_is_current_component( 'activity' ) || !bp_is_user() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $wp_query->is_404 = false;
</span></span></pre></div>
<a id="trunkbpactivitybpactivityscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-screens.php (4846 => 4847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-screens.php 2011-07-25 00:21:20 UTC (rev 4846)
+++ trunk/bp-activity/bp-activity-screens.php 2011-07-25 00:29:19 UTC (rev 4847)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> $activity = bp_activity_get_specific( array( 'activity_ids' => bp_current_action(), 'show_hidden' => true ) );
</span><span class="cx">
</span><span class="cx"> // 404 if activity does not exist
</span><del>- if ( empty( $activity['activities'][0] ) || !empty( $bp->action_variables ) ) {
</del><ins>+ if ( empty( $activity['activities'][0] ) || bp_action_variables() ) {
</ins><span class="cx"> bp_do_404();
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4846 => 4847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-07-25 00:21:20 UTC (rev 4846)
+++ trunk/bp-activity/bp-activity-template.php 2011-07-25 00:29:19 UTC (rev 4847)
</span><span class="lines">@@ -274,12 +274,12 @@
</span><span class="cx"> if ( array_key_exists( $bp->current_action, (array)$bp->active_components ) )
</span><span class="cx"> $scope = $bp->active_components[$bp->current_action];
</span><span class="cx"> else
</span><del>- $scope = $bp->current_action;
</del><ins>+ $scope = bp_current_action();
</ins><span class="cx">
</span><span class="cx"> // Support for permalinks on single item pages: /groups/my-group/activity/124/
</span><span class="cx"> if ( bp_is_current_action( bp_get_activity_slug() ) )
</span><del>- $include = $bp->action_variables[0];
-
</del><ins>+ $include = bp_action_variable( 0 );
+
</ins><span class="cx"> // Note: any params used for filtering can be a single value, or multiple values comma separated.
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'display_comments' => 'threaded', // false for none, stream/threaded - show comments in the stream or threaded under items
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (4846 => 4847)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-07-25 00:21:20 UTC (rev 4846)
+++ trunk/bp-core/bp-core-template.php 2011-07-25 00:29:19 UTC (rev 4847)
</span><span class="lines">@@ -1154,9 +1154,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_group_forum_topic() {
</span><del>- global $bp;
-
- if ( bp_is_single_item() && bp_is_groups_component() && bp_is_current_action( 'forum' ) && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] )
</del><ins>+ if ( bp_is_single_item() && bp_is_groups_component() && bp_is_current_action( 'forum' ) && bp_is_action_variable( 'topic', 0 ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1165,7 +1163,7 @@
</span><span class="cx"> function bp_is_group_forum_topic_edit() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( bp_is_single_item() && bp_is_groups_component() && bp_is_current_action( 'forum' ) && isset( $bp->action_variables[0] ) && 'topic' == $bp->action_variables[0] && isset( $bp->action_variables[2] ) && 'edit' == $bp->action_variables[2] )
</del><ins>+ if ( bp_is_single_item() && bp_is_groups_component() && bp_is_current_action( 'forum' ) && bp_is_action_variable( 'topic', 0 ) && bp_is_action_variable( 'edit', 2 ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>