Changeset 60721

Timestamp:

09/08/2025 01:46:00 PM (2 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Correct the database upgrade routine for WordPress 6.9.

This commit:

• Moves the call to upgrade_690() to the correct place so it actually gets called.
• Wraps Hello Dolly upgrade code in a version check per standard practice.
• Removes the $wpdb->query() call to avoid attempting to create the new index twice, once in the upgrade and once in dbDelta().

Follow-up to [60666], [60716], [60717].

Props peterwilsoncc, mukesh27.
See #50161, #53323.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (2 diffs)

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

@@ -881 +881 @@
     if ( $wp_current_db_version < 58975 ) {
         upgrade_670();
-        upgrade_690();
     }
 
     if ( $wp_current_db_version < 60421 ) {
         upgrade_682();
+    }
+
+    if ( $wp_current_db_version < 60717 ) {
+        upgrade_690();
     }
 
@@ -2489 +2492 @@
  * @since 6.9.0
  *
- * @global int  $wp_current_db_version The old (current) database version.
- * @global wpdb $wpdb                  WordPress database abstraction object.
+ * @global int $wp_current_db_version The old (current) database version.
  */
 function upgrade_690() {
-    global $wp_current_db_version, $wpdb;
-
-    // Switch Hello Dolly from file to directory format. See #53323
-    $active_plugins = get_option( 'active_plugins' );
-    $old_plugin     = 'hello.php';
-    $new_plugin     = 'hello-dolly/hello.php';
-    $key            = array_search( $old_plugin, $active_plugins, true );
-
-    if ( $key ) {
-        $active_plugins[ $key ] = $new_plugin;
-        update_option( 'active_plugins', $active_plugins );
-    }
+    global $wp_current_db_version;
 
     if ( $wp_current_db_version < 60717 ) {
-        $wpdb->query( "ALTER TABLE $wpdb->posts ADD INDEX type_status_author (post_type,post_status,post_author)" );
+        // Switch Hello Dolly from file to directory format. See #53323
+        $active_plugins = get_option( 'active_plugins' );
+        $old_plugin     = 'hello.php';
+        $new_plugin     = 'hello-dolly/hello.php';
+        $key            = array_search( $old_plugin, $active_plugins, true );
+
+        if ( $key ) {
+            $active_plugins[ $key ] = $new_plugin;
+            update_option( 'active_plugins', $active_plugins );
+        }
     }
 }