Ticket #36954: 36954.2.diff

src/wp-admin/options-general.php

@@ -112 +112 @@
         );
         printf(
                 ' <a href="%1$s">%2$s</a>',
-                esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ),
+                esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
                 __( 'Cancel' )
         );
 ?></p>

src/wp-admin/options.php

@@ -66 +66 @@
                 wp_redirect( admin_url( $redirect ) );
                 exit;
         } elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
+                check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
                 delete_option( 'adminhash' );
                 delete_option( 'new_admin_email' );
                 wp_redirect( admin_url( 'options-general.php?updated=true' ) );