<!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] [1908] trunk/bp-activity/bp-activity-templatetags.php:
Removing backwards compatibility code from activity loop since 1.0.
3 templates had explicit parameters passed.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1908</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-21 19:43:14 +0000 (Mon, 21 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing backwards compatibility code from activity loop since 1.0.3 templates had explicit parameters passed. Fixes #1047</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 (1907 => 1908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2009-09-21 18:02:36 UTC (rev 1907)
+++ trunk/bp-activity/bp-activity-templatetags.php 2009-09-21 19:43:14 UTC (rev 1908)
</span><span class="lines">@@ -111,19 +111,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_activity_get_list( $user_id, $title, $no_activity, $limit = false ) {
- global $bp_activity_user_id, $bp_activity_limit, $bp_activity_title, $bp_activity_no_activity;
-
- $bp_activity_user_id = $user_id;
- $bp_activity_limit = $limit;
- $bp_activity_title = $title;
- $bp_activity_no_activity = $no_activity;
-
- locate_template( array( '/activity/activity-list.php' ), true );
-}
-
</del><span class="cx"> function bp_has_activities( $args = '' ) {
</span><del>- global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
</del><ins>+ global $bp, $activities_template;
</ins><span class="cx">
</span><span class="cx"> /* Note: any params used for filtering can be a single value, or multiple values comma seperated. */
</span><span class="cx">
</span><span class="lines">@@ -140,22 +129,7 @@
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><del>-
- // The following lines are for backwards template compatibility.
- if ( 'my-friends' == $bp->current_action && $bp->activity->slug == $bp->current_component )
- $type = 'friends';
-
- if ( $bp->displayed_user->id && $bp->activity->slug == $bp->current_component && ( !$bp->current_action || 'just-me' == $bp->current_action ) )
- $type = 'personal';
-
- if ( $bp->displayed_user->id && $bp->profile->slug == $bp->current_component )
- $type = 'personal';
</del><span class="cx">
</span><del>- if ( $bp_activity_limit )
- $max = $bp_activity_limit;
-
- // END backwards compatibility ---
-
</del><span class="cx"> if ( ( 'personal' == $type || 'friends' == $type ) && !$user_id )
</span><span class="cx"> $user_id = (int)$bp->displayed_user->id;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>