Changeset 32108 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

04/11/2015 10:39:49 AM (9 years ago)

Author:

pento

Message:

When dbDelta() is checking whether an index is defined in a CREATE TABLE statement, don't worry if MySQL has a subpart defined on an index, but the CREATE TABLE doesn't.

Fixes #31869.

File:

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

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

@@ -1981 +1981 @@
                     }
                 }
+
+                // The alternative index string doesn't care about subparts
+                $alt_index_columns = preg_replace( '/\([^)]*\)/', '', $index_columns );
+
                 // Add the column list to the index create string.
-                $index_string .= ' ('.$index_columns.')';
-                if (!(($aindex = array_search($index_string, $indices)) === false)) {
-                    unset($indices[$aindex]);
-                    // todo: Remove this?
-                    //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
+                $index_strings = array(
+                    "$index_string ($index_columns)",
+                    "$index_string ($alt_index_columns)",
+                );
+
+                foreach( $index_strings as $index_string ) {
+                    if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
+                        unset( $indices[ $aindex ] );
+                        break;
+                        // todo: Remove this?
+                        //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
+                    }
                 }
                 // todo: Remove this?