<!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] [2796] branches/1.2:
Added missing date_recorded param to fetch activity ID function.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2796</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-02 12:16:29 +0000 (Tue, 02 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added missing date_recorded param to fetch activity ID function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivitybpactivityclassesphp">branches/1.2/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity/bp-activity-classes.php (2795 => 2796)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity/bp-activity-classes.php 2010-03-02 10:44:46 UTC (rev 2795)
+++ branches/1.2/bp-activity/bp-activity-classes.php 2010-03-02 12:16:29 UTC (rev 2796)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> return array( 'activities' => $activities, 'total' => (int)$total_activities );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content ) {
</del><ins>+ function get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content, $date_recorded ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> $where_args = false;
</span><span class="lines">@@ -224,6 +224,9 @@
</span><span class="cx"> if ( !empty( $content ) )
</span><span class="cx"> $where_args[] = $wpdb->prepare( "content = %s", $content );
</span><span class="cx">
</span><ins>+ if ( !empty( $date_recorded ) )
+ $where_args[] = $wpdb->prepare( "date_recorded = %s", $date_recorded );
+
</ins><span class="cx"> if ( !empty( $where_args ) )
</span><span class="cx"> $where_sql = 'WHERE ' . join( ' AND ', $where_args );
</span><span class="cx"> else
</span></span></pre></div>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (2795 => 2796)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-03-02 10:44:46 UTC (rev 2795)
+++ branches/1.2/bp-activity.php 2010-03-02 12:16:29 UTC (rev 2796)
</span><span class="lines">@@ -774,13 +774,14 @@
</span><span class="cx"> 'item_id' => false,
</span><span class="cx"> 'secondary_item_id' => false,
</span><span class="cx"> 'action' => false,
</span><del>- 'content' => false
</del><ins>+ 'content' => false,
+ 'date_recorded' => false,
</ins><span class="cx"> );
</span><span class="cx">
</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_activity_id', BP_Activity_Activity::get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content ) );
</del><ins>+ return apply_filters( 'bp_activity_get_activity_id', BP_Activity_Activity::get_id( $user_id, $component, $type, $item_id, $secondary_item_id, $action, $content, $date_recorded ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /***
</span></span></pre>
</div>
</div>
</body>
</html>