Changeset 36679 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

02/24/2016 03:33:14 PM (9 years ago)

Author:

ocean90

Message:

Multisite: Switch to a usermeta key for email confirmation.

To prevent inconsistent data across sites in a network the new email address is now stored in usermeta. Adds visual feedback for the case when an update has failed.
All existing options will be removed on a database upgrade.

Props MikeHansenMe, kovshenin, jeremyfelt, ocean90.
Fixes #23358.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -1669 +1669 @@
  * @since 4.5.0
  *
- * @global int $wp_current_db_version
+ * @global int  $wp_current_db_version
+ * @global wpdb $wpdb
  */
 function upgrade_450() {
-    global $wp_current_db_version;
-    if ( $wp_current_db_version < 36180 )
+    global $wp_current_db_version, $wpdb;
+
+    if ( $wp_current_db_version < 36180 ) {
         wp_clear_scheduled_hook( 'wp_maybe_auto_update' );
+    }
+
+    // Remove unused email confirmation options, moved to usermeta.
+    if ( $wp_current_db_version < 36679 && is_multisite() ) {
+        $wpdb->query( "DELETE FROM $wpdb->options WHERE option_name REGEXP '^[0-9]+_new_email$'" );
+    }
 }