<!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][12697] trunk: Remove 'whitelist' language from xProfile component.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12697">12697</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12697","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-31 14:26:24 +0000 (Fri, 31 Jul 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove 'whitelist' language from xProfile component.
This is part of a set of changes to make our codebase clearer and
more inclusive to all contributors.
See <a href="http://buddypress.trac.wordpress.org/ticket/8339">#8339</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofilefunctionsphp">trunk/src/bp-xprofile/bp-xprofile-functions.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilefieldtypephp">trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php</a></li>
<li><a href="#trunktestsphpunittestcasesxprofileclassbpxprofilefieldtypephp">trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-functions.php 2020-07-30 21:35:38 UTC (rev 12696)
+++ trunk/src/bp-xprofile/bp-xprofile-functions.php 2020-07-31 14:26:24 UTC (rev 12697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For certain fields, only certain parameters are acceptable, so add them to the list of allowed values.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $field_type_obj->supports_options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field_type_obj->set_whitelist_values( wp_list_pluck( $field->get_children(), 'name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field_type_obj->set_allowed_values( wp_list_pluck( $field->get_children(), 'name' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the value is in an accepted format for this form field.
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilefieldtypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php 2020-07-30 21:35:38 UTC (rev 12696)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-field-type.php 2020-07-31 14:26:24 UTC (rev 12697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var array Field type allowed values.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $validation_whitelist = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $validation_allowed_values = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Name for field type.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,29 +153,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Add a value to this type's whitelist that profile data will be asserted against.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add a value to this type's list of allowed values that profile data will be asserted against.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.0.0
+ * @deprecated 7.0.0 Use set_allowed_values() instead.
+ *
+ * @param string|array $values Whitelisted values.
+ * @return BP_XProfile_Field_Type
+ */
+ public function set_whitelist_values( $values ) {
+ _deprecated_function( __METHOD__, '7.0.0', 'BP_XProfile_Field_Type::set_allowed_values()' );
+ $this->set_allowed_values( $values );
+ }
+
+ /**
+ * Add a value to this type's list of allowed values that profile data will be asserted against.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * You can call this method multiple times to set multiple formats. When validation is performed,
</span><span class="cx" style="display: block; padding: 0 10px"> * it's successful as long as the new value matches any one of the registered formats.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 7.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string|array $values Whitelisted values.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string|array $values Allowed values.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return BP_XProfile_Field_Type
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function set_whitelist_values( $values ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function set_allowed_values( $values ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $values as $value ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters values for field type's whitelist that profile data will be asserted against.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters values for field type's list of allowed values that profile data will be asserted against.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @deprecated 7.0.0 Use 'bp_xprofile_field_type_set_allowed_values' instead.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value Field value.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $values Original array of values.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param BP_XProfile_Field_Type $this Current instance of the BP_XProfile_Field_Type class.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->validation_whitelist[] = apply_filters( 'bp_xprofile_field_type_set_whitelist_values', $value, $values, $this );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->validation_allowed_values[] = apply_filters_deprecated( 'bp_xprofile_field_type_set_whitelist_values', array( $value, $values, $this ), '7.0.0', 'bp_xprofile_field_type_set_allowed_values' );
+
+ /**
+ * Filters values for field type's list of allowed values that profile data will be asserted against.
+ *
+ * @since 7.0.0
+ *
+ * @param string $value Field value.
+ * @param array $values Original array of values.
+ * @param BP_XProfile_Field_Type $this Current instance of the BP_XProfile_Field_Type class.
+ */
+ $this->validation_allowed_values[] = apply_filters( 'bp_xprofile_field_type_set_allowed_values', $value, $values, $this );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,10 +240,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $validated = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // If there's a whitelist set, make sure that each value is a whitelisted value.
- if ( ( true === $validated ) && ! empty( $values ) && ! empty( $this->validation_whitelist ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If there's a list of allowed values, make sure that each value is on that list.
+ if ( ( true === $validated ) && ! empty( $values ) && ! empty( $this->validation_allowed_values ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $values as $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $value, $this->validation_whitelist, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, $this->validation_allowed_values, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $validated = false;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestcasesxprofileclassbpxprofilefieldtypephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php 2020-07-30 21:35:38 UTC (rev 12696)
+++ trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php 2020-07-31 14:26:24 UTC (rev 12697)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,17 +24,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( 123 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_textbox_validate_whitelisted_string() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_textbox_validate_allowed_string() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'textbox' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( 'a string' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( $field->set_whitelist_values( 'pizza' )->is_valid( 'pasta' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( $field->set_allowed_values( 'pizza' )->is_valid( 'pasta' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( 'pizza' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_multiselectbox_validate_whitelisted_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_multiselectbox_validate_allowed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'multiselectbox' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 'cheese', 'pepporoni' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 'cheese', 'pepporoni' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_multiselectbox_validate_null_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'multiselectbox' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 'cheese', 'pepporoni' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 'cheese', 'pepporoni' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( array( '' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( '' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,9 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_number_validate_whitelisted_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_number_validate_allowed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'number' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 123, 456 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 123, 456 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 123 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 456 ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,9 +108,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( array( 789 ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_radiobutton_validate_whitelisted_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_radiobutton_validate_allowed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'radio' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 'cheese', 'pepporoni' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 'cheese', 'pepporoni' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,16 +119,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( '' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_radiobutton_do_not_validate_empty_items_in_whitelist() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_radiobutton_do_not_validate_empty_items_in_allowed_list() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'radio' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( '' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( '' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( array( '' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_checkbox_validate_whitelisted_array() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_checkbox_validate_allowed_array() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'checkbox' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 'cheese', 'pepporoni' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 'cheese', 'pepporoni' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_checkbox_validate_null_value() {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = bp_xprofile_create_field_type( 'checkbox' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->set_whitelist_values( array( 'cheese', 'pepporoni' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->set_allowed_values( array( 'cheese', 'pepporoni' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( array( '' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( $field->is_valid( '' ) );
</span></span></pre>
</div>
</div>
</body>
</html>