From 8c841df86d4afcb32eade18b90314cd9e6a5325f Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 15 Mar 2012 18:09:14 +0000
Subject: [PATCH] Revert type="email" (HTML5) as some browsers that do
 validation on these fields do not work for IDN domains yet. Core does not
 support these well either, but server-side validation can at least be dealt
 with by a plugin. see #17863.

git-svn-id: http://svn.automattic.com/wordpress/trunk@20196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-form-comment.php  | 2 +-
 wp-admin/includes/template.php  | 2 +-
 wp-admin/network/site-users.php | 2 +-
 wp-admin/options-general.php    | 4 ++--
 wp-admin/user-edit.php          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index cb2f02d81..8cc4647af 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -92,7 +92,7 @@ $date = date_i18n( $datef, strtotime( $comment->comment_date ) );
 			_e( 'E-mail:' );
 		}
 ?></td>
-	<td><input type="email" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
+	<td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" tabindex="2" id="email" /></td>
 </tr>
 <tr valign="top">
 	<td class="first">
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index c74c9333a..6896cf14e 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -323,7 +323,7 @@ function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single',
 
 		<div class="inside">
 		<label for="author-email"><?php _e('E-mail') ?></label>
-		<input type="email" name="newcomment_author_email" size="50" value="" tabindex="102" id="author-email" />
+		<input type="text" name="newcomment_author_email" size="50" value="" tabindex="102" id="author-email" />
 		</div>
 
 		<div class="inside">
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 1a36d38a5..9be8ed597 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -300,7 +300,7 @@ endif; ?>
 		</tr>
 		<tr>
 			<th scope="row"><?php _e( 'Email' ) ?></th>
-			<td><input type="email" class="regular-text" name="user[email]" /></td>
+			<td><input type="text" class="regular-text" name="user[email]" /></td>
 		</tr>
 		<tr>
 			<th scope="row"><?php _e( 'Role'); ?></th>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 6a7d6f8de..a4649b8b3 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -113,7 +113,7 @@ include('./admin-header.php');
 </tr>
 <tr valign="top">
 <th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
-<td><input name="admin_email" type="email" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
 <span class="description"><?php _e('This address is used for admin purposes, like new user notification.') ?></span></td>
 </tr>
 <tr valign="top">
@@ -132,7 +132,7 @@ include('./admin-header.php');
 <?php } else { ?>
 <tr valign="top">
 <th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
-<td><input name="new_admin_email" type="email" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
+<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" class="regular-text ltr" />
 <span class="description"><?php _e('This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></span>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 039f999d1..4fabfb9dc 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -333,7 +333,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
 <table class="form-table">
 <tr>
 	<th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" />
+	<td><input type="text" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text" />
 	<?php
 	$new_email = get_option( $current_user->ID . '_new_email' );
 	if ( $new_email && $new_email != $current_user->user_email ) : ?>