Ticket #37324: 37324.patch

src/wp-admin/ms-delete-site.php

@@ -16 +16 @@
         wp_die(__( 'Sorry, you are not allowed to delete this site.'));
 
 if ( isset( $_GET['h'] ) && $_GET['h'] != '' && get_option( 'delete_blog_hash' ) != false ) {
-        if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
+        if ( hash_equals( get_option( 'delete_blog_hash' ), $_GET['h'] ) ) {
                 wpmu_delete_blog( $wpdb->blogid );
                 wp_die( sprintf( __( 'Thank you for using %s, your site has been deleted. Happy trails to you until we meet again.' ), $current_site->site_name ) );
         } else {

src/wp-admin/options.php

@@ -57 +57 @@
         if ( ! empty($_GET[ 'adminhash' ] ) ) {
                 $new_admin_details = get_option( 'adminhash' );
                 $redirect = 'options-general.php?updated=false';
-                if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
+                if ( is_array( $new_admin_details ) && hash_equals( $new_admin_details[ 'hash' ], $_GET[ 'adminhash' ] ) && !empty($new_admin_details[ 'newemail' ]) ) {
                         update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
                         delete_option( 'adminhash' );
                         delete_option( 'new_admin_email' );