<!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][8525] trunk/src/bp-activity/bp-activity-functions.php: Don't use extract() in bp_activity_new_comment()</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8525">8525</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-06-15 18:12:02 +0000 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use extract() in bp_activity_new_comment()
See <a href="http://buddypress.trac.wordpress.org/ticket/5698">#5698</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfunctionsphp">trunk/src/bp-activity/bp-activity-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-functions.php (8524 => 8525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-functions.php 2014-06-15 18:02:40 UTC (rev 8524)
+++ trunk/src/bp-activity/bp-activity-functions.php 2014-06-15 18:12:02 UTC (rev 8525)
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_new_comment( $args = '' ) {
</span><span class="cx">
</span><del>- $params = wp_parse_args( $args, array(
</del><ins>+ $r = wp_parse_args( $args, array(
</ins><span class="cx"> 'id' => false,
</span><span class="cx"> 'content' => false,
</span><span class="cx"> 'user_id' => bp_loggedin_user_id(),
</span><span class="lines">@@ -1266,31 +1266,31 @@
</span><span class="cx"> 'parent_id' => false // ID of a parent comment (optional)
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- extract( $params, EXTR_SKIP );
-
</del><span class="cx"> // Bail if missing necessary data
</span><del>- if ( empty( $content ) || empty( $user_id ) || empty( $activity_id ) ) {
</del><ins>+ if ( empty( $r['content'] ) || empty( $r['user_id'] ) || empty( $r['activity_id'] ) ) {
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Maybe set current activity ID as the parent
</span><del>- if ( empty( $parent_id ) ) {
- $parent_id = $activity_id;
</del><ins>+ if ( empty( $r['parent_id'] ) ) {
+ $r['parent_id'] = $r['activity_id'];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ $activity_id = $r['activity_id'];
+
</ins><span class="cx"> // Check to see if the parent activity is hidden, and if so, hide this comment publically.
</span><span class="cx"> $activity = new BP_Activity_Activity( $activity_id );
</span><span class="cx"> $is_hidden = ( (int) $activity->hide_sitewide ) ? 1 : 0;
</span><span class="cx">
</span><span class="cx"> // Insert the activity comment
</span><span class="cx"> $comment_id = bp_activity_add( array(
</span><del>- 'id' => $id,
- 'content' => apply_filters( 'bp_activity_comment_content', $content ),
</del><ins>+ 'id' => $r['id'],
+ 'content' => apply_filters( 'bp_activity_comment_content', $r['content'] ),
</ins><span class="cx"> 'component' => buddypress()->activity->id,
</span><span class="cx"> 'type' => 'activity_comment',
</span><del>- 'user_id' => $user_id,
</del><ins>+ 'user_id' => $r['user_id'],
</ins><span class="cx"> 'item_id' => $activity_id,
</span><del>- 'secondary_item_id' => $parent_id,
</del><ins>+ 'secondary_item_id' => $r['parent_id'],
</ins><span class="cx"> 'hide_sitewide' => $is_hidden
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="lines">@@ -1298,7 +1298,7 @@
</span><span class="cx"> wp_cache_delete( $activity_id, 'bp_activity_comments' );
</span><span class="cx">
</span><span class="cx"> // Walk the tree to clear caches for all parent items
</span><del>- $clear_id = $parent_id;
</del><ins>+ $clear_id = $r['parent_id'];
</ins><span class="cx"> while ( $clear_id != $activity_id ) {
</span><span class="cx"> $clear_object = new BP_Activity_Activity( $clear_id );
</span><span class="cx"> wp_cache_delete( $clear_id, 'bp_activity' );
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> }
</span><span class="cx"> wp_cache_delete( $activity_id, 'bp_activity' );
</span><span class="cx">
</span><del>- do_action( 'bp_activity_comment_posted', $comment_id, $params, $activity );
</del><ins>+ do_action( 'bp_activity_comment_posted', $comment_id, $r, $activity );
</ins><span class="cx">
</span><span class="cx"> return $comment_id;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>