Changeset 26566

Timestamp:

12/03/2013 05:43:52 PM (11 years ago)

Author:

nacin

Message:

In dbDelta(), ensure we are not running CREATE TABLE queries for global tables we wish to not upgrade.

props fliespl.
fixes #22134.

File:

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

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

@@ -1550 +1550 @@
     foreach ( $cqueries as $table => $qry ) {
         // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
-        if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
+        if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) ) {
+            unset( $cqueries[ $table ], $for_update[ $table ] );
             continue;
+        }
 
         // Fetch the table column structure from the database