From f7441d78e989fb46b0c29d3eef93091dcb53bc5f Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 16 Feb 2012 15:42:02 +0000
Subject: [PATCH] Combine two identical case statements.

git-svn-id: https://develop.svn.wordpress.org/trunk@19933 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/formatting.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 7e5a760a76..e7a0226867 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2620,21 +2620,13 @@ function wp_make_link_relative( $link ) {
 function sanitize_option($option, $value) {
 
 	switch ( $option ) {
-		case 'admin_email':
-			$value = sanitize_email($value);
-			if ( !is_email($value) ) {
+		case 'admin_email' :
+		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('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 '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.'));
+				if ( function_exists( 'add_settings_error' ) )
+					add_settings_error( $option, 'invalid_admin_email', __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' ) );
 			}
 			break;