From aac8038dae57b0ce030f36f862bb1f197c09eba4 Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Wed, 30 May 2012 15:30:26 +0000 Subject: [PATCH] [-] Installer : Notice some constants are already defined git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15769 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/controllers/http/database.php | 3 ++- install-dev/controllers/http/process.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/install-dev/controllers/http/database.php b/install-dev/controllers/http/database.php index 214686953..18cc95e7f 100644 --- a/install-dev/controllers/http/database.php +++ b/install-dev/controllers/http/database.php @@ -155,7 +155,7 @@ class InstallControllerHttpDatabase extends InstallControllerHttp { 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_name = _DB_NAME_; $this->database_login = _DB_USER_; @@ -202,3 +202,4 @@ class InstallControllerHttpDatabase extends InstallControllerHttp $this->displayTemplate('database'); } } + diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php index fa96d7864..4cdadabee 100644 --- a/install-dev/controllers/http/process.php +++ b/install-dev/controllers/http/process.php @@ -76,7 +76,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp public function process() { 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) $this->session->process_validated = array(); @@ -357,3 +357,4 @@ class InstallControllerHttpProcess extends InstallControllerHttp $this->displayTemplate('process'); } } +