golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Run the sanitize_option_* filter for all options in sanitize_option(). Add some sanity checks for the permalink options while in there. fixes #18737 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18738 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-09-21 19:05:06 +00:00
parent 4228aa301c
commit 7aedd7ec52
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/formatting.php
View File

@ -2462,6 +2462,7 @@ function sanitize_option($option, $value) {
add_settings_error('admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.')); add_settings_error('admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.'));
} }
break; break;
case 'new_admin_email': case 'new_admin_email':
$value = sanitize_email($value); $value = sanitize_email($value);
if ( !is_email($value) ) { if ( !is_email($value) ) {
@ -2470,6 +2471,7 @@ function sanitize_option($option, $value) {
add_settings_error('new_admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.')); add_settings_error('new_admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.'));
} }
break; break;
case 'thumbnail_size_w': case 'thumbnail_size_w':
case 'thumbnail_size_h': case 'thumbnail_size_h':
case 'medium_size_w': case 'medium_size_w':
@ -2563,6 +2565,7 @@ function sanitize_option($option, $value) {
add_settings_error('home', 'invalid_home', __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.')); add_settings_error('home', 'invalid_home', __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.'));
} }
break; break;
case 'WPLANG': case 'WPLANG':
$allowed = get_available_languages(); $allowed = get_available_languages();
if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) if ( ! in_array( $value, $allowed ) && ! empty( $value ) )
@ -2578,11 +2581,16 @@ function sanitize_option($option, $value) {
} }
break; break;
default : case 'permalink_structure':
$value = apply_filters("sanitize_option_{$option}", $value, $option); case 'category_base':
case 'tag_base':
$value = esc_url_raw( $value );
$value = str_replace( 'http://', '', $value );
break; break;
} }
$value = apply_filters("sanitize_option_{$option}", $value, $option);
return $value; return $value;
} }