Ticket #8014: 8014.001.diff

trunk/wp-admin/includes/upgrade.php

@@ -2 +2 @@
 /**
  * WordPress Upgrade API
  *
- * Most of the functions are pluggable and can be overwritten 
+ * Most of the functions are pluggable and can be overwritten
  *
  * @package WordPress
  * @subpackage Administration
@@ -1119 +1119 @@
         // 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)) {
@@ -1158 +1158 @@
                                 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;