Skip to content

Fast follow: Actually call upgrade_690, avoid attempt to add index twice. #9791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
+16 −16
Closed

Fast follow: Actually call upgrade_690, avoid attempt to add index twice. #9791

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c359842
Move 690 upgrade routine call out of 670 section.
peterwilsoncc Sep 8, 2025
678536a
Remove unneeded DB call to add index.
peterwilsoncc Sep 8, 2025
07c7075
Wrap Hello Dolly upgrade call in db version check.
peterwilsoncc Sep 8, 2025
7b92e16
This should trigger failing upgrade tests.
peterwilsoncc Sep 8, 2025
37397e9
Revert "This should trigger failing upgrade tests." (It didn't, warni…
peterwilsoncc Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/wp-admin/includes/upgrade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,13 +880,16 @@ function upgrade_all() {

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();
}

maybe_disable_link_manager();

maybe_disable_automattic_widgets();
Expand Down Expand Up @@ -2488,25 +2491,22 @@ function ( $url ) {
* @ignore
* @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 );
}
}
}

Expand Down
Loading