Ticket #31869: 31869.diff

src/wp-admin/includes/upgrade.php

@@ -1963 +1963 @@
                                 if ($index_name != 'PRIMARY') {
                                         $index_string .= $index_name;
                                 }
-                                $index_columns = '';
+                                $alt_index_columns = $index_columns = '';
 
                                 // For each column in the index.
                                 foreach ($index_data['columns'] as $column_data) {
-                                        if ($index_columns != '') $index_columns .= ',';
+                                        if ( '' != $index_columns ) {
+                                                $index_columns     .= ',';
+                                                $alt_index_columns .= ',';
+                                        }
 
                                         // Add the field to the column list string.
-                                        $index_columns .= $column_data['fieldname'];
+                                        $index_columns     .= $column_data['fieldname'];
+                                        $alt_index_columns .= $column_data['fieldname'];
                                         if ($column_data['subpart'] != '') {
+                                                // We don't add the subpart to the alternative index string
                                                 $index_columns .= '('.$column_data['subpart'].')';
                                         }
                                 }
+
+                                $alt_index_string = $index_string;
+
                                 // Add the column list to the index create string.
-                                $index_string .= ' ('.$index_columns.')';
+                                $index_string     .= ' (' . $index_columns . ')';
+                                $alt_index_string .= ' (' . $alt_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";
                                 }
+                                if ( ! ( ( $aindex = array_search( $alt_index_string, $indices ) ) === false ) ) {
+                                        _doing_it_wrong( __FUNCTION__, sprintf( __( 'You should be specifying an index length in your CREATE TABLE statement for the %s index.' ), "$table.$index_name" ), '4.2' );
+                                        unset( $indices[ $aindex ] );
+                                }
                                 // todo: Remove this?
                                 //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
                         }