<!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][8535] trunk: Record 'option_order' when passed through 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/8535">8535</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-06-16 19:30:37 +0000 (Mon, 16 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Record 'option_order' when passed through xprofile_insert_field()
Previously, this value was not recorded in the main part of BP_XProfile_Field.
Instead, the requisite option_order checking only happened when a parent field
was being saved via the UI.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5472">#5472</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofileclassesphp">trunk/src/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunktestsphpunittestcasesxprofilefunctionsphp">trunk/tests/phpunit/testcases/xprofile/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-classes.php (8534 => 8535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-06-16 19:23:57 UTC (rev 8534)
+++ trunk/src/bp-xprofile/bp-xprofile-classes.php 2014-06-16 19:30:37 UTC (rev 8535)
</span><span class="lines">@@ -635,15 +635,16 @@
</span><span class="cx"> $this->is_required = apply_filters( 'xprofile_field_is_required_before_save', $this->is_required, $this->id );
</span><span class="cx"> $this->order_by = apply_filters( 'xprofile_field_order_by_before_save', $this->order_by, $this->id );
</span><span class="cx"> $this->field_order = apply_filters( 'xprofile_field_field_order_before_save', $this->field_order, $this->id );
</span><ins>+ $this->option_order = apply_filters( 'xprofile_field_option_order_before_save', $this->option_order, $this->id );
</ins><span class="cx"> $this->can_delete = apply_filters( 'xprofile_field_can_delete_before_save', $this->can_delete, $this->id );
</span><span class="cx"> $this->type_obj = bp_xprofile_create_field_type( $this->type );
</span><span class="cx">
</span><span class="cx"> do_action_ref_array( 'xprofile_field_before_save', array( $this ) );
</span><span class="cx">
</span><span class="cx"> if ( $this->id != null ) {
</span><del>- $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d, can_delete = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->can_delete, $this->id );
</del><ins>+ $sql = $wpdb->prepare( "UPDATE {$bp->profile->table_name_fields} SET group_id = %d, parent_id = 0, type = %s, name = %s, description = %s, is_required = %d, order_by = %s, field_order = %d, option_order = %d, can_delete = %d WHERE id = %d", $this->group_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->option_order, $this->can_delete, $this->id );
</ins><span class="cx"> } else {
</span><del>- $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order, can_delete ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->can_delete );
</del><ins>+ $sql = $wpdb->prepare( "INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, order_by, field_order, option_order, can_delete ) VALUES (%d, %d, %s, %s, %s, %d, %s, %d, %d, %d )", $this->group_id, $this->parent_id, $this->type, $this->name, $this->description, $this->is_required, $this->order_by, $this->field_order, $this->option_order, $this->can_delete );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestcasesxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/testcases/xprofile/functions.php (8534 => 8535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/testcases/xprofile/functions.php 2014-06-16 19:23:57 UTC (rev 8534)
+++ trunk/tests/phpunit/testcases/xprofile/functions.php 2014-06-16 19:30:37 UTC (rev 8535)
</span><span class="lines">@@ -590,4 +590,28 @@
</span><span class="cx">
</span><span class="cx"> $this->assertNotEmpty( $f );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @group xprofile_insert_field
+ */
+ public function test_xprofile_insert_field_type_option_option_order() {
+ $g = $this->factory->xprofile_group->create();
+ $parent = $this->factory->xprofile_field->create( array(
+ 'field_group_id' => $g,
+ 'type' => 'selectbox',
+ 'name' => 'Parent',
+ ) );
+
+ $f = xprofile_insert_field( array(
+ 'field_group_id' => $g,
+ 'parent_id' => $parent,
+ 'type' => 'option',
+ 'name' => 'Option 1',
+ 'option_order' => 5,
+ ) );
+
+ $field = new BP_XProfile_Field( $f );
+
+ $this->assertEquals( 5, $field->option_order );
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>