WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle backticks in dbDelta. Props AaronCampbell. fixes #8014 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-04-16 17:45:11 +00:00
parent ab49d00bc4
commit 4e62823c7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/upgrade.php
View File

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