Changeset 37111 for branches/3.7/src/wp-admin/user-edit.php

Timestamp:

03/30/2016 02:49:25 PM (9 years ago)

Author:

ocean90

Message:

Multisite: Validate new email address confirmations.

Merge of [37103] to the 3.7 branch.

File:

• branches/3.7/src/wp-admin/user-edit.php (modified) (3 diffs)

branches/3.7/src/wp-admin/user-edit.php

@@ -82 +82 @@
 if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
     $new_email = get_option( $current_user->ID . '_new_email' );
-    if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) {
+    if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
         $user = new stdClass;
         $user->ID = $current_user->ID;
@@ -93 +93 @@
         die();
     }
-} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' == $_GET['dismiss'] ) {
+} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) {
+    check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
     delete_option( $current_user->ID . '_new_email' );
     wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
@@ -339 +340 @@
     if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
     <div class="updated inline">
-    <p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), $new_email['newemail'], esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?></p>
+    <p><?php printf( __('There is a pending change of your e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_email['newemail'] ), esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ) ); ?></p>
     </div>
     <?php endif; ?>