Ticket #10404: 10404_make_key_case_insensitive_wp_4_1.diff

src/wp-admin/includes/upgrade.php

@@ -1727 +1727 @@
                         case 'unique':
                         case 'key':
                                 $validfield = false;
-                                $indices[] = trim(trim($fld), ", \n");
+                                $indices[] = strtoupper(trim(trim($fld), ", \n"));
                                 break;
                         }
                         $fld = trim($fld);
@@ -1825 +1825 @@
                                 }
                                 // 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";
-                                }
+                if (!(($aindex = array_search(strtoupper($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";
+                    }
+                }
                                 // 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";
                         }