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

// Fixed install in low performance mode

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17762 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-10-04 15:00:31 +00:00
1 parent 294af01eff
commit beb8206250
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/process.php
+6 -6
View File
@@ -132,7 +132,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
if (!$success) if (!$success)
$this->ajaxJsonAnswer(false); $this->ajaxJsonAnswer(false);
$this->session->process_validated = array('generateSettingsFile' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('generateSettingsFile' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -144,7 +144,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
{ {
if (!$this->model_install->installDatabase($this->session->database_clear) || $this->model_install->getErrors()) if (!$this->model_install->installDatabase($this->session->database_clear) || $this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->process_validated = array('installDatabase' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('installDatabase' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -175,7 +175,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
if (!$result || $this->model_install->getErrors()) if (!$result || $this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->xml_loader_ids = $this->model_install->xml_loader_ids; $this->session->xml_loader_ids = $this->model_install->xml_loader_ids;
$this->session->process_validated = array('populateDatabase' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('populateDatabase' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -207,7 +207,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
if (!$success || $this->model_install->getErrors()) if (!$success || $this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->process_validated = array('configureShop' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('configureShop' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -222,7 +222,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$result = $this->model_install->installModules(Tools::getValue('module')); $result = $this->model_install->installModules(Tools::getValue('module'));
if (!$result || $this->model_install->getErrors()) if (!$result || $this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->process_validated = array('installModules' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('installModules' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -253,7 +253,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
if ($this->model_install->getErrors()) if ($this->model_install->getErrors())
$this->ajaxJsonAnswer(false, $this->model_install->getErrors()); $this->ajaxJsonAnswer(false, $this->model_install->getErrors());
$this->session->process_validated = array('installTheme' => true); $this->session->process_validated = array_merge($this->session->process_validated, array('installTheme' => true));
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }