dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix install when _DB_PREFIX_ is empty

Browse Source
This commit is contained in:
rMalie
2012-02-16 14:44:09 +00:00
parent dc1b554aec
commit f30aca6cb4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/classes/xmlLoader.php
+1 -1
View File
@@ -683,7 +683,7 @@ class InstallXmlLoader
if (!isset($columns[$table])) if (!isset($columns[$table]))
{ {
$columns[$table] = array(); $columns[$table] = array();
$sql = 'SHOW COLUMNS FROM `'.bqSQL(_DB_PREFIX_.$table).'`'; $sql = 'SHOW COLUMNS FROM `'._DB_PREFIX_.bqSQL($table).'`';
foreach (Db::getInstance()->executeS($sql) as $row) foreach (Db::getInstance()->executeS($sql) as $row)
$columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']); $columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']);
} }
install-dev/models/install.php
+2 -2
View File
@@ -131,8 +131,8 @@ class InstallModelInstall extends InstallAbstractModel
foreach (Db::getInstance()->executeS('SHOW TABLES') as $row) foreach (Db::getInstance()->executeS('SHOW TABLES') as $row)
{ {
$table = current($row); $table = current($row);
if (preg_match('#^'._DB_PREFIX_.'#i', $table)) if (!_DB_PREFIX_ || preg_match('#^'._DB_PREFIX_.'#i', $table))
Db::getInstance()->execute((($truncate) ? 'TRUNCATE' : 'DROP TABLE').' '.$table); Db::getInstance()->execute((($truncate) ? 'TRUNCATE' : 'DROP TABLE').' `'.$table.'`');
} }
} }