<!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][3580] trunk: Consolidate BP_Activity_Activity::get_specific/::get methods.</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>3580</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-24 19:25:05 +0000 (Fri, 24 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate BP_Activity_Activity::get_specific/::get methods. Fixes #2970, reverts a part of r 3566 and fixes a PHP notice.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpactivityphp">trunk/bp-activity.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (3579 => 3580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2010-12-24 14:30:23 UTC (rev 3579)
+++ trunk/bp-activity/bp-activity-classes.php 2010-12-24 19:25:05 UTC (rev 3580)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> // Exclude specified items
</span><span class="cx"> if ( $exclude )
</span><span class="cx"> $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
</span><del>-
</del><ins>+
</ins><span class="cx"> // The specific ids to which you want to limit the query
</span><span class="cx"> if ( !empty( $in ) ) {
</span><span class="cx"> if ( is_array( $in ) )
</span><span class="lines">@@ -180,37 +180,24 @@
</span><span class="cx"> return array( 'activities' => $activities, 'total' => (int)$total_activities );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /**
+ * In BuddyPress 1.2.x, this was used to retrieve specific activity stream items (for example, on an activity's permalink page).
+ * As of 1.3.x, use BP_Activity_Activity::get( ..., $in ) instead.
+ *
+ * @deprecated 1.3
+ * @deprecated Use BP_Activity_Activity::get( ..., $in ) instead.
+ * @param mixed $activity_ids Array or comma-separated string of activity IDs to retrieve
+ * @param int $max Maximum number of results to return. (Optional; default is no maximum)
+ * @param int $page The set of results that the user is viewing. Used in pagination. (Optional; default is 1)
+ * @param int $per_page Specifies how many results per page. Used in pagination. (Optional; default is 25)
+ * @param string MySQL column sort; ASC or DESC. (Optional; default is DESC)
+ * @param bool $display_comments Retrieve an activity item's associated comments or not. (Optional; default is false)
+ * @return array
+ * @since 1.2
+ */
</ins><span class="cx"> function get_specific( $activity_ids, $max = false, $page = 1, $per_page = 25, $sort = 'DESC', $display_comments = false ) {
</span><del>- global $wpdb, $bp;
-
- if ( is_array( $activity_ids ) )
- $activity_ids = implode( ',', $activity_ids );
-
- $activity_ids = $wpdb->escape( $activity_ids );
-
- if ( empty( $activity_ids ) )
- return false;
-
- $pag_sql = '';
- if ( $per_page && $page )
- $pag_sql = $wpdb->prepare( "LIMIT %d, %d", intval( ( $page - 1 ) * $per_page ), intval( $per_page ) );
-
- if ( $sort != 'ASC' && $sort != 'DESC' )
- $sort = 'DESC';
-
- $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids}) ORDER BY date_recorded {$sort} $pag_sql" ) );
- $total_activities = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM {$bp->activity->table_name} WHERE id IN ({$activity_ids})" ) );
-
- if ( $display_comments )
- $activities = BP_Activity_Activity::append_comments( $activities );
-
- // If $max is set, only return up to the max results
- if ( !empty( $max ) ) {
- if ( (int)$total_activities > (int)$max )
- $total_activities = $max;
- }
-
- return array( 'activities' => $activities, 'total' => (int)$total_activities );
</del><ins>+ _deprecated_function( __FUNCTION__, '1.3', 'Use BP_Activity_Activity::get( ..., $in ) instead.' );
+ return BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, false, false, $activity_ids );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content, $date_recorded ) {
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3579 => 3580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-12-24 14:30:23 UTC (rev 3579)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-12-24 19:25:05 UTC (rev 3580)
</span><span class="lines">@@ -423,7 +423,7 @@
</span><span class="cx"> if ( empty( $activities_template->activity->user_id ) )
</span><span class="cx"> $link = $activities_template->activity->primary_link;
</span><span class="cx"> else
</span><del>- $link = bp_core_get_user_domain( $activities_template->activity->user_id );
</del><ins>+ $link = bp_core_get_user_domain( $activities_template->activity->user_id, $activities_template->activity->user_nicename, $activities_template->activity->user_login );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activity_user_link', $link );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity.php (3579 => 3580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity.php 2010-12-24 14:30:23 UTC (rev 3579)
+++ trunk/bp-activity.php 2010-12-24 19:25:05 UTC (rev 3580)
</span><span class="lines">@@ -260,9 +260,9 @@
</span><span class="cx"> $redirect = false;
</span><span class="cx"> /* Redirect based on the type of activity */
</span><span class="cx"> if ( $activity->component == $bp->groups->id ) {
</span><del>- if ( $activity->user_id )
</del><ins>+ if ( $activity->user_id ) {
</ins><span class="cx"> $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . $bp->activity->slug . '/' . $activity->id . '/';
</span><del>- else {
</del><ins>+ } else {
</ins><span class="cx"> if ( $group = groups_get_group( array( 'group_id' => $activity->item_id ) ) )
</span><span class="cx"> $redirect = bp_get_group_permalink( $group ) . $bp->activity->slug . '/' . $activity->id . '/';
</span><span class="cx"> }
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r, EXTR_SKIP );
</span><span class="cx">
</span><del>- return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get_specific( $activity_ids, $max, $page, $per_page, $sort, $display_comments ) );
</del><ins>+ return apply_filters( 'bp_activity_get_specific', BP_Activity_Activity::get( $max, $page, $per_page, $sort, false, false, $display_comments, false, false, $activity_ids ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_activity_add( $args = '' ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (3579 => 3580)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-12-24 14:30:23 UTC (rev 3579)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-12-24 19:25:05 UTC (rev 3580)
</span><span class="lines">@@ -189,8 +189,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $comment_id = bp_activity_new_comment( array(
</span><ins>+ 'activity_id' => $_POST['form_id'],
</ins><span class="cx"> 'content' => $_POST['content'],
</span><del>- 'activity_id' => $_POST['form_id'],
</del><span class="cx"> 'parent_id' => $_POST['comment_id']
</span><span class="cx"> ));
</span><span class="cx">
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( bp_has_activities ( 'include=' . $comment_id ) ) : ?>
</del><ins>+ if ( bp_has_activities ( 'display_comments=stream&include=' . $comment_id ) ) : ?>
</ins><span class="cx"> <?php while ( bp_activities() ) : bp_the_activity(); ?>
</span><span class="cx"> <li id="acomment-<?php bp_activity_id() ?>">
</span><span class="cx"> <div class="acomment-avatar">
</span></span></pre>
</div>
</div>
</body>
</html>