Changeset 20936 for trunk/wp-includes/class-wp-customize-setting.php

Timestamp:

05/26/2012 06:44:31 PM (14 years ago)

Author:

koopersmith

Message:

Theme Customizer: Ensure that JS color controls always use real color values, even if the server-side value is a hex value without a hash. fixes #20448, see #19910.

Adds WP_Customize_Setting->sanitize_js_callback and 'customize_sanitize_js_$settingID' filter, to filter values before they're passed to JS using WP_Customize_Setting->js_value().

Adds support for regular hex colors to the color picker.

Changes color methods:

• sanitize_hex_color() accepts 3 and 6 digit hex colors (with hashes) and the empty string.
• sanitize_hex_color_no_hash() accepts 3 and 6 digit hex colors (without hashes) and the empty string.
• maybe_hash_hex_color() ensures that a hex color has a hash, and otherwise leaves the value untouched.

File:

• trunk/wp-includes/class-wp-customize-setting.php (modified) (4 diffs)

trunk/wp-includes/class-wp-customize-setting.php

@@ -12 +12 @@
         public $id;
 
-        public $type              = 'theme_mod';
-        public $capability        = 'edit_theme_options';
-        public $theme_supports    = '';
-        public $default           = '';
-        public $sanitize_callback = '';
-        public $transport         = 'refresh';
+        public $type            = 'theme_mod';
+        public $capability      = 'edit_theme_options';
+        public $theme_supports  = '';
+        public $default         = '';
+        public $transport       = 'refresh';
+
+        public $sanitize_callback    = '';
+        public $sanitize_js_callback = '';
 
         protected $id_data = array();
@@ -50 +52 @@
                         $this->id .= '[' . implode( '][', $this->id_data[ 'keys' ] ) . ']';
 
-                if ( $this->sanitize_callback != '' )
-                        add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback );
+                if ( $this->sanitize_callback )
+                        add_filter( "customize_sanitize_{$this->id}", $this->sanitize_callback, 10, 2 );
+
+                if ( $this->sanitize_js_callback )
+                        add_filter( "customize_sanitize_js_{$this->id}", $this->sanitize_js_callback, 10, 2 );
 
                 return $this;
@@ -139 +144 @@
         public function sanitize( $value ) {
                 $value = stripslashes_deep( $value );
-                return apply_filters( "customize_sanitize_{$this->id}", $value );
+                return apply_filters( "customize_sanitize_{$this->id}", $value, $this );
         }
 
@@ -239 +244 @@
          */
         public function js_value() {
-                $value = $this->value();
+                $value = apply_filters( "customize_sanitize_js_{$this->id}", $this->value(), $this );
 
                 if ( is_string( $value ) )