Skip to content

Commit 94bfca7

Browse files
Coding Standards: Move upgrade_690() to the correct place, after upgrade_682().
Follow-up to [60666]. See #53323. git-svn-id: https://develop.svn.wordpress.org/trunk@60716 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 359980f commit 94bfca7

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

src/wp-admin/includes/upgrade.php

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2416,28 +2416,6 @@ function upgrade_650() {
24162416
}
24172417
}
24182418

2419-
/**
2420-
* Executes changes made in WordPress 6.9.0.
2421-
*
2422-
* @ignore
2423-
* @since 6.9.0
2424-
*
2425-
* @global int $wp_current_db_version The old (current) database version.
2426-
*/
2427-
function upgrade_690() {
2428-
global $wp_current_db_version;
2429-
2430-
// Switch Hello Dolly from file to directory format. See #53323
2431-
$active_plugins = get_option( 'active_plugins' );
2432-
$old_plugin = 'hello.php';
2433-
$new_plugin = 'hello-dolly/hello.php';
2434-
$key = array_search( $old_plugin, $active_plugins, true );
2435-
2436-
if ( $key ) {
2437-
$active_plugins[ $key ] = $new_plugin;
2438-
update_option( 'active_plugins', $active_plugins );
2439-
}
2440-
}
24412419
/**
24422420
* Executes changes made in WordPress 6.7.0.
24432421
*
@@ -2504,6 +2482,29 @@ function ( $url ) {
25042482
}
25052483
}
25062484

2485+
/**
2486+
* Executes changes made in WordPress 6.9.0.
2487+
*
2488+
* @ignore
2489+
* @since 6.9.0
2490+
*
2491+
* @global int $wp_current_db_version The old (current) database version.
2492+
*/
2493+
function upgrade_690() {
2494+
global $wp_current_db_version, $wpdb;
2495+
2496+
// Switch Hello Dolly from file to directory format. See #53323
2497+
$active_plugins = get_option( 'active_plugins' );
2498+
$old_plugin = 'hello.php';
2499+
$new_plugin = 'hello-dolly/hello.php';
2500+
$key = array_search( $old_plugin, $active_plugins, true );
2501+
2502+
if ( $key ) {
2503+
$active_plugins[ $key ] = $new_plugin;
2504+
update_option( 'active_plugins', $active_plugins );
2505+
}
2506+
}
2507+
25072508
/**
25082509
* Executes network-level upgrade routines.
25092510
*

0 commit comments

Comments
 (0)