From 9680d4987b7c6e220ecd9a7ad333103d0bb4fbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Fri, 29 Mar 2013 17:05:13 +0100 Subject: [PATCH] // don't return errors twice on module installation on installer --- install-dev/controllers/console/process.php | 10 ++++++++++ install-dev/models/install.php | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/install-dev/controllers/console/process.php b/install-dev/controllers/console/process.php index 553868359..938353f5c 100644 --- a/install-dev/controllers/console/process.php +++ b/install-dev/controllers/console/process.php @@ -97,6 +97,8 @@ class InstallControllerConsoleProcess extends InstallControllerConsole $this->printErrors(); if (!$this->processInstallModules()) $this->printErrors(); + if (!$this->processInstallAddonsModules()) + $this->printErrors(); if (!$this->processInstallFixtures()) $this->printErrors(); if (!$this->processInstallTheme()) @@ -265,5 +267,13 @@ class InstallControllerConsoleProcess extends InstallControllerConsole return true; } + /** + * PROCESS : installModulesAddons + * Install modules from addons + */ + public function processInstallAddonsModules() + { + return $this->model_install->installModulesAddons(); + } } diff --git a/install-dev/models/install.php b/install-dev/models/install.php index 4b5ad2211..f450ddc40 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -621,8 +621,7 @@ class InstallModelInstall extends InstallAbstractModel } $errors = array(); foreach ($modules as $module_name) - if (!$this->installModules($module_name)) - $errors[] = $this->language->l('Cannot install module "%s"', $module_name); + $this->installModules($module_name); if ($errors) {