<!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][8520] trunk/src/bp-activity/bp-activity-functions.php: Don't use extract() in bp_activity_add()</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/8520">8520</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-06-15 13:01:44 +0000 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use extract() in bp_activity_add()
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 (8519 => 8520)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-functions.php 2014-06-15 13:01:40 UTC (rev 8519)
+++ trunk/src/bp-activity/bp-activity-functions.php 2014-06-15 13:01:44 UTC (rev 8520)
</span><span class="lines">@@ -1131,29 +1131,28 @@
</span><span class="cx"> 'hide_sitewide' => false, // Should this be hidden on the sitewide activity stream?
</span><span class="cx"> 'is_spam' => false, // Is this activity item to be marked as spam?
</span><span class="cx"> );
</span><del>- $params = wp_parse_args( $args, $defaults );
- extract( $params, EXTR_SKIP );
</del><ins>+ $r = wp_parse_args( $args, $defaults );
</ins><span class="cx">
</span><span class="cx"> // Make sure we are backwards compatible
</span><del>- if ( empty( $component ) && !empty( $component_name ) )
- $component = $component_name;
</del><ins>+ if ( empty( $r['component'] ) && !empty( $r['component_name'] ) )
+ $r['component'] = $r['component_name'];
</ins><span class="cx">
</span><del>- if ( empty( $type ) && !empty( $component_action ) )
- $type = $component_action;
</del><ins>+ if ( empty( $r['type'] ) && !empty( $r['component_action'] ) )
+ $r['type'] = $r['component_action'];
</ins><span class="cx">
</span><span class="cx"> // Setup activity to be added
</span><del>- $activity = new BP_Activity_Activity( $id );
- $activity->user_id = $user_id;
- $activity->component = $component;
- $activity->type = $type;
- $activity->content = $content;
- $activity->primary_link = $primary_link;
- $activity->item_id = $item_id;
- $activity->secondary_item_id = $secondary_item_id;
- $activity->date_recorded = $recorded_time;
- $activity->hide_sitewide = $hide_sitewide;
- $activity->is_spam = $is_spam;
- $activity->action = ! empty( $action ) ? $action : bp_activity_generate_action_string( $activity );
</del><ins>+ $activity = new BP_Activity_Activity( $r['id'] );
+ $activity->user_id = $r['user_id'];
+ $activity->component = $r['component'];
+ $activity->type = $r['type'];
+ $activity->content = $r['content'];
+ $activity->primary_link = $r['primary_link'];
+ $activity->item_id = $r['item_id'];
+ $activity->secondary_item_id = $r['secondary_item_id'];
+ $activity->date_recorded = $r['recorded_time'];
+ $activity->hide_sitewide = $r['hide_sitewide'];
+ $activity->is_spam = $r['is_spam'];
+ $activity->action = ! empty( $r['action'] ) ? $r['action'] : bp_activity_generate_action_string( $activity );
</ins><span class="cx">
</span><span class="cx"> if ( !$activity->save() )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1163,7 +1162,7 @@
</span><span class="cx"> BP_Activity_Activity::rebuild_activity_comment_tree( $activity->item_id );
</span><span class="cx">
</span><span class="cx"> wp_cache_delete( 'bp_activity_sitewide_front', 'bp' );
</span><del>- do_action( 'bp_activity_add', $params );
</del><ins>+ do_action( 'bp_activity_add', $r );
</ins><span class="cx">
</span><span class="cx"> return $activity->id;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>