<!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] [3485] trunk/bp-activity/bp-activity-templatetags.php:
Makes bp_has_activities() respect custom component slugs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3485</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-26 16:21:43 +0000 (Fri, 26 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Makes bp_has_activities() respect custom component slugs. Fixes #2588</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3484 => 3485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-11-24 18:57:17 UTC (rev 3484)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-11-26 16:21:43 UTC (rev 3485)
</span><span class="lines">@@ -132,6 +132,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_has_activities()
+ *
+ * Initializes the activity loop.
+ *
+ * Based on the $args passed, bp_has_activities() populates the $activities_template global.
+ *
+ * @package BuddyPress Activity
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ *
+ * @param mixed $args Arguments for limiting the contents of the activity loop. Can be passed as an associative array or as a URL argument string
+ * @return bool Returns true when activities are found
+ */
</ins><span class="cx"> function bp_has_activities( $args = '' ) {
</span><span class="cx"> global $bp, $activities_template;
</span><span class="cx">
</span><span class="lines">@@ -148,11 +161,11 @@
</span><span class="cx"> $object = false;
</span><span class="cx"> $primary_id = false;
</span><span class="cx">
</span><del>- /* User filtering */
</del><ins>+ // User filtering
</ins><span class="cx"> if ( !empty( $bp->displayed_user->id ) )
</span><span class="cx"> $user_id = $bp->displayed_user->id;
</span><span class="cx">
</span><del>- /* Group filtering */
</del><ins>+ // Group filtering
</ins><span class="cx"> if ( !empty( $bp->groups->current_group ) ) {
</span><span class="cx"> $object = $bp->groups->id;
</span><span class="cx"> $primary_id = $bp->groups->current_group->id;
</span><span class="lines">@@ -160,6 +173,13 @@
</span><span class="cx"> if ( 'public' != $bp->groups->current_group->status && ( groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) || $bp->loggedin_user->is_super_admin ) )
</span><span class="cx"> $show_hidden = true;
</span><span class="cx"> }
</span><ins>+
+ // The default scope should recognize custom slugs
+ if ( array_key_exists( $bp->current_action, (array)$bp->active_components ) ) {
+ $scope = $bp->active_components[$bp->current_action];
+ } else {
+ $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->current_action == $bp->activity->slug )
</span></span></pre>
</div>
</div>
</body>
</html>