Changes in branches/3.1/wp-includes/formatting.php [18031:18356]

File:

• branches/3.1/wp-includes/formatting.php (modified) (3 diffs)

branches/3.1/wp-includes/formatting.php

@@ -2441 +2441 @@
                         }
                         break;
-
+                case 'new_admin_email':
+                        $value = sanitize_email($value);
+                        if ( !is_email($value) ) {
+                                $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization
+                                if ( function_exists('add_settings_error') )
+                                        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;
                 case 'thumbnail_size_w':
                 case 'thumbnail_size_h':
@@ -2535 +2542 @@
                         }
                         break;
+                case 'WPLANG':
+                        $allowed = get_available_languages();
+                        if ( ! in_array( $value, $allowed ) && ! empty( $value ) )
+                                $value = get_option( $option );
+                        break;
 
                 default :
@@ -2913 +2925 @@
  */
 function sanitize_mime_type( $mime_type ) {
-        $sani_mime_type = preg_replace( '/[^-*.a-zA-Z0-9\/]/', '', $mime_type );
+        $sani_mime_type = preg_replace( '/[^-+*.a-zA-Z0-9\/]/', '', $mime_type );
         return apply_filters( 'sanitize_mime_type', $sani_mime_type, $mime_type );
 }