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

// Fix table verification when drop DB is activated on new installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12198 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-05 15:09:40 +00:00
parent db989ce7d7
commit 77e2df9627
4 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-new/models/database.php
+3 -2
View File
@@ -36,9 +36,10 @@ class InstallModelDatabase extends InstallAbstractModel
* @param string $password
* @param string $prefix
* @param string $engine
* @param bool $clear
* @return array List of errors
*/
public function testDatabaseSettings($server, $database, $login, $password, $prefix, $engine)
public function testDatabaseSettings($server, $database, $login, $password, $prefix, $engine, $clear)
{
$errors = array();
@@ -68,7 +69,7 @@ class InstallModelDatabase extends InstallAbstractModel
$errors[] = $this->language->l('Cannot convert database data to utf-8');
// Check if a table with same prefix already exists
if (Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix))
if (!$clear && Db::hasTableWithSamePrefix($server, $login, $password, $database, $prefix))
$errors[] = $this->language->l('At least one table with same prefix was already found, please change your prefix or drop your database');
break;