From 68e619fb00a290e315470a6c4e682f6a9d680060 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Jul 2012 21:50:08 +0200 Subject: [PATCH] Fix: escape for create command --- htdocs/core/db/mysql.class.php | 6 +++--- htdocs/core/db/mysqli.class.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index fd83f876f64..76825a2d08a 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -800,15 +800,15 @@ class DoliDBMysql if (empty($collation)) $collation=$this->forcecollate; // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci - $sql = "CREATE DATABASE '".$this->escape($database)."'"; - $sql.= " DEFAULT CHARACTER SET '".$this->escape($charset)."' DEFAULT COLLATE '".$this->escape($collation)."'"; + $sql = "CREATE DATABASE `".$this->escape($database)."`"; + $sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`"; dol_syslog($sql,LOG_DEBUG); $ret=$this->query($sql); if (! $ret) { // We try again for compatibility with Mysql < 4.1.1 - $sql = 'CREATE DATABASE '.$database; + $sql = "CREATE DATABASE `".$this->escape($database)."`"; dol_syslog($sql,LOG_DEBUG); $ret=$this->query($sql); } diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index db2a4481422..4dde08c9775 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -794,15 +794,15 @@ class DoliDBMysqli if (empty($collation)) $collation=$this->forcecollate; // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci - $sql = "CREATE DATABASE '".$this->escape($database)."'"; - $sql.= " DEFAULT CHARACTER SET '".$this->escape($charset)."' DEFAULT COLLATE '".$this->escape($collation)."'"; + $sql = "CREATE DATABASE `".$this->escape($database)."`"; + $sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`"; dol_syslog($sql,LOG_DEBUG); $ret=$this->query($sql); if (! $ret) { // We try again for compatibility with Mysql < 4.1.1 - $sql = 'CREATE DATABASE '.$database; + $sql = "CREATE DATABASE `".$this->escape($database)."`"; dol_syslog($sql,LOG_DEBUG); $ret=$this->query($sql); }