WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Theme Customizer: Improve hex color sanitization functions. fixes #20600, see #19910. 

Instead of fetching default header_textcolor manually, return null to do so automatically.
Improve hex regex.


git-svn-id: http://core.svn.wordpress.org/trunk@20910 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
koopersmith 2012-05-25 18:54:57 +00:00
parent f28ecbabc4
commit 0e67a9a8c4
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/class-wp-customize-manager.php
View File

@ -846,10 +846,7 @@ final class WP_Customize_Manager {
// Callback function for sanitizing the header textcolor setting. // Callback function for sanitizing the header textcolor setting.
function sanitize_header_textcolor( $color ) { function sanitize_header_textcolor( $color ) {
if ( empty( $color ) ) if ( $color == 'blank' )
return get_theme_support( 'custom-header', 'default-text-color' );
elseif ( $color == 'blank' )
return 'blank'; return 'blank';
return sanitize_hexcolor( $color ); return sanitize_hexcolor( $color );
@ -859,8 +856,9 @@ function sanitize_header_textcolor( $color ) {
function sanitize_hexcolor( $color ) { function sanitize_hexcolor( $color ) {
$color = preg_replace( '/[^0-9a-fA-F]/', '', $color ); $color = preg_replace( '/[^0-9a-fA-F]/', '', $color );
if ( preg_match('|[A-Fa-f0-9]{3,6}|', $color ) ) // 3 or 6 hex digits.
if ( preg_match('|^([A-Fa-f0-9]{3}){1,2}$|', $color ) )
return $color; return $color;
return $color; return null;
} }