Ticket #8014: 8014.002.2.diff

trunk/wp-admin/includes/upgrade.php

@@ -1185 +1185 @@
         // Create a tablename index for an array ($cqueries) of queries
         foreach($queries as $qry) {
                 if(preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
-                        $cqueries[strtolower($matches[1])] = $qry;
+                        $cqueries[trim( strtolower($matches[1]), '`' )] = $qry;
                         $for_update[$matches[1]] = 'Created table '.$matches[1];
                 }
                 else if(preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
@@ -1224 +1224 @@
                                 foreach($flds as $fld) {
                                         // Extract the field name
                                         preg_match("|^([^ ]*)|", trim($fld), $fvals);
-                                        $fieldname = $fvals[1];
+                                        $fieldname = trim( $fvals[1], '`' );
 
                                         // Verify the found field name
                                         $validfield = true;