Changeset 28542

Timestamp:

05/22/2014 06:33:34 PM (11 years ago)

Author:

wonderboymusic

Message:

Because PHP can be configured without --filter, it is not 100% safe to use filter_var(). This is problematic for casting "false" to false, as PHP always casts it to true. FILTER_VALIDATE_BOOLEAN fixes this, but it may not be available.

Add a new function, wp_validate_boolean(), to replace filter_var( $var, FILTER_VALIDATE_BOOLEAN ).

Fixes #28170.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• media.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -4446 +4446 @@
     mbstring_binary_safe_encoding( true );
 }
+
+/**
+ * Alternative to filter_var( $var, FILTER_VALIDATE_BOOLEAN )
+ *
+ * @since 4.0.0
+ *
+ * @param mixed $var
+ * @return boolean
+ */
+function wp_validate_boolean( $var ) {
+    if ( is_bool( $var ) ) {
+        return $var;
+    }
+
+    if ( 'false' === $var ) {
+        return false;
+    }
+
+    return (bool) $var;
+}

trunk/src/wp-includes/media.php

@@ -1273 +1273 @@
         'type' => $atts['type'],
         // don't pass strings to JSON, will be truthy in JS
-        'tracklist' => filter_var( $atts['tracklist'], FILTER_VALIDATE_BOOLEAN ),
-        'tracknumbers' => filter_var( $atts['tracknumbers'], FILTER_VALIDATE_BOOLEAN ),
-        'images' => filter_var( $atts['images'], FILTER_VALIDATE_BOOLEAN ),
-        'artists' => filter_var( $atts['artists'], FILTER_VALIDATE_BOOLEAN ),
+        'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
+        'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
+        'images' => wp_validate_boolean( $atts['images'] ),
+        'artists' => wp_validate_boolean( $atts['artists'] ),
     );