Ticket #25779: 25779.2.patch

src/wp-admin/includes/ms.php

@@ -756 +756 @@
         $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
 
         $user = get_userdata( $user_id );
-        if ( $user && $user->user_email != get_site_option( 'admin_email' ) ) {
+        if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
                 if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
                         unset( $super_admins[$key] );
                         update_site_option( 'site_admins', $super_admins );

src/wp-includes/pluggable.php

@@ -1137 +1137 @@
         $post = get_post($comment->comment_post_ID);
         $user = get_userdata( $post->post_author );
         // Send to the administration and to the post author if the author can modify the comment.
-        $emails = array( get_option('admin_email') );
-        if ( user_can($user->ID, 'edit_comment', $comment_id) && !empty($user->user_email) && ( get_option('admin_email') != $user->user_email) )
-                $emails[] = $user->user_email;
+        $emails = array( get_option( 'admin_email' ) );
+        if ( user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
+                if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
+                        $emails[] = $user->user_email;
+        }
 
         $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
         $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
@@ -1213 +1215 @@
 function wp_password_change_notification(&$user) {
         // send a copy of password change notification to the admin
         // but check to see if it's the admin whose password we're changing, and skip this
-        if ( $user->user_email != get_option('admin_email') ) {
+        if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
                 $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
                 // The blogname option is escaped with esc_html on the way into the database in sanitize_option
                 // we want to reverse this for the plain text arena of emails.