diff --git a/install-dev/classes/model.php b/install-dev/classes/model.php index 9352e593a..15af24e7f 100644 --- a/install-dev/classes/model.php +++ b/install-dev/classes/model.php @@ -32,11 +32,6 @@ abstract class InstallAbstractModel */ public $language; - /** - * @var FileLogger - */ - public $logger; - /** * @var array List of errors */ @@ -45,9 +40,6 @@ abstract class InstallAbstractModel public function __construct() { $this->language = InstallLanguages::getInstance(); - - $this->logger = new FileLogger(); - $this->logger->setFilename(_PS_ROOT_DIR_.'/log/'.@date('Ymd').'_installation.log'); } public function setError($errors) @@ -55,11 +47,7 @@ abstract class InstallAbstractModel if (!is_array($errors)) $errors = array($errors); - foreach ($errors as $error) - { - $this->errors[] = $error; - $this->logger->logError($error); - } + $this->errors[] = $errors; } public function getErrors() diff --git a/install-dev/models/install.php b/install-dev/models/install.php index 966431754..d335f69ba 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -29,6 +29,30 @@ class InstallModelInstall extends InstallAbstractModel { const SETTINGS_FILE = 'config/settings.inc.php'; + /** + * @var FileLogger + */ + public $logger; + + public function __construct() + { + parent::__construct(); + + $this->logger = new FileLogger(); + $this->logger->setFilename(_PS_ROOT_DIR_.'/log/'.@date('Ymd').'_installation.log'); + } + + public function setError($errors) + { + if (!is_array($errors)) + $errors = array($errors); + + parent::setError($errors); + + foreach ($errors as $error) + $this->logger->logError($error); + } + /** * Generate settings file */