Changeset 22911 for trunk/wp-admin/includes/upgrade.php

Timestamp:

11/29/2012 12:37:30 AM (14 years ago)

Author:

nacin

Message:

Fix disabling of the link manager on upgrade from 3.4.2 when there are no links.

In the 3.4 branch we bumped the DB version past the version used for disabling links in trunk, preventing it from running. In the future, we must avoid increasing branch DB version bumps to HEAD.

props SergeyBiryukov.
fixes #22626.

File:

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

trunk/wp-admin/includes/upgrade.php

@@ -1190 +1190 @@
         global $wp_current_db_version, $wpdb;
 
-        if ( $wp_current_db_version < 21501 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+        if ( $wp_current_db_version < 22006 && $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
                 update_option( 'link_manager_enabled', 1 ); // Previously set to 0 by populate_options()
 
@@ -1949 +1949 @@
         global $wp_current_db_version, $wpdb;
 
-        if ( $wp_current_db_version >= 21501 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
+        if ( $wp_current_db_version >= 22006 && get_option( 'link_manager_enabled' ) && ! $wpdb->get_var( "SELECT link_id FROM $wpdb->links LIMIT 1" ) )
                 update_option( 'link_manager_enabled', 0 );
 }