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 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13395 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-16 14:44:09 +00:00
parent 83053fa035
commit 40798e75dd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install-dev/classes/xmlLoader.php
View File

@@ -683,7 +683,7 @@ class InstallXmlLoader
if (!isset($columns[$table]))
{
$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)
$columns[$table][$row['Field']] = $this->checkIfTypeIsText($row['Type']);
}

4
install-dev/models/install.php
View File

@@ -131,8 +131,8 @@ class InstallModelInstall extends InstallAbstractModel
foreach (Db::getInstance()->executeS('SHOW TABLES') as $row)
{
$table = current($row);
if (preg_match('#^'._DB_PREFIX_.'#i', $table))
Db::getInstance()->execute((($truncate) ? 'TRUNCATE' : 'DROP TABLE').' '.$table);
if (!_DB_PREFIX_ || preg_match('#^'._DB_PREFIX_.'#i', $table))
Db::getInstance()->execute((($truncate) ? 'TRUNCATE' : 'DROP TABLE').' `'.$table.'`');
}
}