Ticket #6884: 6884.02.patch

src/bp-xprofile/classes/class-bp-xprofile-field-type.php

@@ -206 +206 @@
                         $validated = true;
                 }
 
-                // If there's a whitelist set, also check the $value.
+                // If there's a whitelist set, make sure that each value is a whitelisted value.
                 if ( ( true === $validated ) && ! empty( $values ) && ! empty( $this->validation_whitelist ) ) {
                         foreach ( (array) $values as $value ) {
-                                $validated = in_array( $value, $this->validation_whitelist, true );
+                                if ( ! in_array( $value, $this->validation_whitelist, true ) ) {
+                                        $validated = false;
+                                        break;
+                                }
                         }
                 }
 

tests/phpunit/testcases/xprofile/class-bp-xprofile-field-type.php

@@ -38 +38 @@
 
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array( 'cheese', 'pinapple', 'pepporoni' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
         }
 
@@ -104 +104 @@
 
                 $this->assertTrue( $field->is_valid( array( 123 ) ) );
                 $this->assertTrue( $field->is_valid( array( 456 ) ) );
-                $this->assertFalse( $field->is_valid( array( 123, 456, 789 ) ) );
+                $this->assertFalse( $field->is_valid( array( 789, 456, 123 ) ) );
                 $this->assertFalse( $field->is_valid( array( 789 ) ) );
         }
 
@@ -114 +114 @@
 
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array(  'pinapple', 'cheese', 'pepporoni' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( '' ) );
         }
@@ -132 +132 @@
 
                 $this->assertTrue( $field->is_valid( array( 'cheese', 'pepporoni' ) ) );
                 $this->assertTrue( $field->is_valid( array( 'cheese' ) ) );
-                $this->assertFalse( $field->is_valid( array( 'cheese', 'pepporoni', 'pinapple' ) ) );
+                $this->assertFalse( $field->is_valid( array( 'pepporoni', 'cheese', 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( array( 'pinapple' ) ) );
                 $this->assertFalse( $field->is_valid( '' ) );
         }