<!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][8534] trunk/src/bp-xprofile/bp-xprofile-functions.php: Don't use extract() in xprofile_insert_field()</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/8534">8534</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-06-16 19:23:57 +0000 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't use extract() in xprofile_insert_field()
This one was particularly heinous.
See <a href="http://buddypress.trac.wordpress.org/ticket/5698">#5698</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilefunctionsphp">trunk/src/bp-xprofile/bp-xprofile-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-functions.php (8533 => 8534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-functions.php 2014-06-16 19:17:58 UTC (rev 8533)
+++ trunk/src/bp-xprofile/bp-xprofile-functions.php 2014-06-16 19:23:57 UTC (rev 8534)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> * the field. Default: false.
</span><span class="cx"> * @type bool $can_delete Optional. Whether admins can delete this field in
</span><span class="cx"> * the Dashboard interface. Generally this is true only for the Name
</span><del>- * field, which is required throughout BP. Default: false.
</del><ins>+ * field, which is required throughout BP. Default: true.
</ins><span class="cx"> * @type string $order_by Optional. For field types that support options
</span><span class="cx"> * (such as 'radio'), this flag determines whether the sort order of
</span><span class="cx"> * the options will be 'default' (order created) or 'custom'.
</span><span class="lines">@@ -135,53 +135,78 @@
</span><span class="cx"> function xprofile_insert_field( $args = '' ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- extract( $args );
</del><ins>+ $r = wp_parse_args( $args, array(
+ 'field_id' => null,
+ 'field_group_id' => null,
+ 'parent_id' => null,
+ 'type' => '',
+ 'name' => '',
+ 'description' => '',
+ 'is_required' => false,
+ 'can_delete' => true,
+ 'order_by' => '',
+ 'is_default_option' => false,
+ 'option_order' => null,
+ ) );
</ins><span class="cx">
</span><del>- // Check we have the minimum details
- if ( empty( $field_group_id ) )
</del><ins>+ // field_group_id is required
+ if ( empty( $r['field_group_id'] ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Check this is a valid field type
</span><del>- if ( !in_array( $type, (array) $bp->profile->field_types ) )
</del><ins>+ if ( ! in_array( $r['type'], (array) $bp->profile->field_types ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Instantiate a new field object
</span><del>- if ( !empty( $field_id ) )
- $field = new BP_XProfile_Field( $field_id );
- else
</del><ins>+ if ( ! empty( $r['field_id'] ) ) {
+ $field = new BP_XProfile_Field( $r['field_id'] );
+ } else {
</ins><span class="cx"> $field = new BP_XProfile_Field;
</span><ins>+ }
</ins><span class="cx">
</span><del>- $field->group_id = $field_group_id;
</del><ins>+ $field->group_id = $r['field_group_id'];
</ins><span class="cx">
</span><del>- if ( !empty( $parent_id ) )
- $field->parent_id = $parent_id;
</del><ins>+ if ( ! empty( $r['parent_id'] ) ) {
+ $field->parent_id = $r['parent_id'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $type ) )
- $field->type = $type;
</del><ins>+ if ( ! empty( $r['type'] ) ) {
+ $field->type = $r['type'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $name ) )
- $field->name = $name;
</del><ins>+ if ( ! empty( $r['name'] ) ) {
+ $field->name = $r['name'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $description ) )
- $field->description = $description;
</del><ins>+ if ( ! empty( $r['description'] ) ) {
+ $field->description = $r['description'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $is_required ) )
- $field->is_required = $is_required;
</del><ins>+ if ( ! empty( $r['is_required'] ) ) {
+ $field->is_required = $r['is_required'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $can_delete ) )
- $field->can_delete = $can_delete;
</del><ins>+ if ( ! empty( $r['can_delete'] ) ) {
+ $field->can_delete = $r['can_delete'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $field_order ) )
- $field->field_order = $field_order;
</del><ins>+ if ( ! empty( $r['field_order'] ) ) {
+ $field->field_order = $r['field_order'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $order_by ) )
- $field->order_by = $order_by;
</del><ins>+ if ( ! empty( $r['order_by'] ) ) {
+ $field->order_by = $r['order_by'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $is_default_option ) )
- $field->is_default_option = $is_default_option;
</del><ins>+ if ( ! empty( $r['is_default_option'] ) ) {
+ $field->is_default_option = $r['is_default_option'];
+ }
</ins><span class="cx">
</span><del>- if ( !empty( $option_order ) )
- $field->option_order = $option_order;
</del><ins>+ if ( ! empty( $r['option_order'] ) ) {
+ $field->option_order = $r['option_order'];
+ }
</ins><span class="cx">
</span><span class="cx"> return $field->save();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>