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

[-] Installer : Notice some constants are already defined

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15769 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2012-05-30 15:30:26 +00:00
parent 852567f5ee
commit aac8038dae
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/database.php
+2 -1
View File
@@ -155,7 +155,7 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
{ {
if (file_exists(_PS_ROOT_DIR_.'/config/settings.inc.php')) if (file_exists(_PS_ROOT_DIR_.'/config/settings.inc.php'))
{ {
include_once _PS_ROOT_DIR_.'/config/settings.inc.php'; @include_once _PS_ROOT_DIR_.'/config/settings.inc.php';
$this->database_server = _DB_SERVER_; $this->database_server = _DB_SERVER_;
$this->database_name = _DB_NAME_; $this->database_name = _DB_NAME_;
$this->database_login = _DB_USER_; $this->database_login = _DB_USER_;
@@ -202,3 +202,4 @@ class InstallControllerHttpDatabase extends InstallControllerHttp
$this->displayTemplate('database'); $this->displayTemplate('database');
} }
} }
install-dev/controllers/http/process.php
+2 -1
View File
@@ -76,7 +76,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
public function process() public function process()
{ {
if (file_exists(_PS_ROOT_DIR_.'/'.self::SETTINGS_FILE)) if (file_exists(_PS_ROOT_DIR_.'/'.self::SETTINGS_FILE))
require_once _PS_ROOT_DIR_.'/'.self::SETTINGS_FILE; @require_once _PS_ROOT_DIR_.'/'.self::SETTINGS_FILE;
if (!$this->session->process_validated) if (!$this->session->process_validated)
$this->session->process_validated = array(); $this->session->process_validated = array();
@@ -357,3 +357,4 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$this->displayTemplate('process'); $this->displayTemplate('process');
} }
} }