Changeset 30207

Timestamp:

11/03/2014 03:54:42 PM (12 years ago)

Author:

boonebgorges

Message:

Ignore case when checking string 'false' in wp_validate_boolean().

Props TobiasBg, kitchin.
Fixes #30238.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions/WpValidateBoolean.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -4741 +4741 @@
 
 /**
- * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN ).
+ * Filter/validate a variable as a boolean.
+ *
+ * Alternative to `filter_var( $var, FILTER_VALIDATE_BOOLEAN )`.
  *
  * @since 4.0.0
@@ -4753 +4755 @@
         }
 
-        if ( 'false' === $var ) {
+        if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
                 return false;
         }

trunk/tests/phpunit/tests/functions/WpValidateBoolean.php

@@ -57 +57 @@
                 $this->assertFalse( wp_validate_boolean( 'false' ) );
         }
+
+        /**
+         * @ticket 30238
+         */
+        public function test_string_false_uppercase() {
+                // Differs from (bool) conversion.
+                $this->assertFalse( wp_validate_boolean( 'FALSE' ) );
+        }
+
+        /**
+         * @ticket 30238
+         */
+        public function test_string_false_mixedcase() {
+                // Differs from (bool) conversion.
+                $this->assertFalse( wp_validate_boolean( 'FaLsE' ) );
+        }
 }