Ticket #52976: 52976.1.patch

src/wp-admin/includes/misc.php

@@ -1410 +1410 @@
  * @param string $value     The proposed new site admin email address.
  */
 function update_option_new_admin_email( $old_value, $value ) {
-        if ( get_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
+        if ( 0 === strcasecmp( get_option( 'admin_email' ), $value ) || ! is_email( $value ) ) {
                 return;
         }
 

src/wp-admin/includes/class-wp-screen.php

@@ -1126 +1126 @@
                                 update_user_meta( get_current_user_id(), 'show_welcome_panel', $welcome_checked );
                         } else {
                                 $welcome_checked = (int) get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
-                                if ( 2 === $welcome_checked && wp_get_current_user()->user_email !== get_option( 'admin_email' ) ) {
+                                if ( 2 === $welcome_checked && 0 !== strcasecmp( wp_get_current_user()->user_email, get_option( 'admin_email' ) ) ) {
                                         $welcome_checked = false;
                                 }
                         }

src/wp-includes/ms-functions.php

@@ -2802 +2802 @@
  * @param string $value     The proposed new network admin email address.
  */
 function update_network_option_new_admin_email( $old_value, $value ) {
-        if ( get_site_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
+        if ( 0 === strcasecmp( get_site_option( 'admin_email' ), $value ) || ! is_email( $value ) ) {
                 return;
         }
 

src/wp-admin/includes/class-wp-automatic-updater.php

@@ -258 +258 @@
 
                 // Don't notify if we've already notified the same email address of the same version.
                 if ( $notified
-                        && get_site_option( 'admin_email' ) === $notified['email']
+                        && 0 === strcasecmp( get_site_option( 'admin_email' ), $notified['email'] )
                         && $notified['version'] === $item->current
                 ) {
                         return false;
@@ -636 +636 @@
                 // Don't notify if we've already notified the same email address of the same version of the same notification type.
                 if ( $notified
                         && 'fail' === $notified['type']
-                        && get_site_option( 'admin_email' ) === $notified['email']
+                        && 0 === strcasecmp( get_site_option( 'admin_email' ), $notified['email'] )
                         && $notified['version'] === $core_update->current
                 ) {
                         $send = false;

src/wp-admin/user-edit.php

@@ -519 +519 @@
                                                         <?php endif; ?>
 
                                                         <?php $new_email = get_user_meta( $current_user->ID, '_new_email', true ); ?>
-                                                        <?php if ( $new_email && $new_email['newemail'] !== $current_user->user_email && $profile_user->ID === $current_user->ID ) : ?>
+                                                        <?php if ( $new_email && 0 !== strcasecmp( $new_email['newemail'], $current_user->user_email ) && $profile_user->ID === $current_user->ID ) : ?>
                                                         <div class="updated inline">
                                                                 <p>
                                                                         <?php

src/wp-admin/options-general.php

@@ -114 +114 @@
 <p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, an email will be sent to your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email ) :
+if ( $new_admin_email && 0 !== strcasecmp( get_option( 'admin_email' ), $new_admin_email ) ) :
         ?>
         <div class="updated inline">
         <p>

src/wp-admin/_index.php

@@ -175 +175 @@
 
         $option = (int) get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
         // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner.
-        $hide = ( 0 === $option || ( 2 === $option && wp_get_current_user()->user_email !== get_option( 'admin_email' ) ) );
+        $hide = ( 0 === $option || ( 2 === $option && 0 !== strcasecmp( wp_get_current_user()->user_email, get_option( 'admin_email' ) ) ) );
         if ( $hide ) {
                 $classes .= ' hidden';
         }

src/wp-includes/user.php

@@ -2332 +2332 @@
         }
 
         if ( $update ) {
-                if ( $user_email !== $old_user_data->user_email || $user_pass !== $old_user_data->user_pass ) {
+                if ( 0 !== strcasecmp( $user_email, $old_user_data->user_email ) || $user_pass !== $old_user_data->user_pass ) {
                         $data['user_activation_key'] = '';
                 }
                 $wpdb->update( $wpdb->users, $data, array( 'ID' => $user_id ) );
@@ -2531 +2531 @@
                 $send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
         }
 
-        if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
+        if ( isset( $userdata['user_email'] ) && 0 !== strcasecmp( $user['user_email'], $userdata['user_email'] ) ) {
                 /**
                  * Filters whether to send the email change email.
                  *

src/wp-admin/network/settings.php

@@ -166 +166 @@
                                         </p>
                                         <?php
                                         $new_admin_email = get_site_option( 'new_admin_email' );
-                                        if ( $new_admin_email && get_site_option( 'admin_email' ) !== $new_admin_email ) :
+                                        if ( $new_admin_email && 0 !== strcasecmp( get_site_option( 'admin_email' ), $new_admin_email ) ) :
                                                 ?>
                                                 <div class="updated inline">
                                                 <p>