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

//fixed bug due to specific configuration or php version

Browse Source
This commit is contained in:
vAugagneur
2012-09-14 15:46:55 +00:00
parent 0d69d772f4
commit 9e703356f1
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/configure.php
+3
View File
@@ -30,6 +30,9 @@
*/ */
class InstallControllerHttpConfigure extends InstallControllerHttp class InstallControllerHttpConfigure extends InstallControllerHttp
{ {
public $list_countries = array();
/** /**
* @see InstallAbstractModel::processNextStep() * @see InstallAbstractModel::processNextStep()
*/ */
install-dev/controllers/http/process.php
+9 -8
View File
@@ -33,7 +33,9 @@ class InstallControllerHttpProcess extends InstallControllerHttp
* @var InstallModelInstall * @var InstallModelInstall
*/ */
protected $model_install; protected $model_install;
public $process_steps = array();
public $previous_button = false; public $previous_button = false;
public function init() public function init()
@@ -130,7 +132,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
if (!$success) if (!$success)
$this->ajaxJsonAnswer(false); $this->ajaxJsonAnswer(false);
$this->session->process_validated['generateSettingsFile'] = true; $this->session->process_validated = array('generateSettingsFile' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -142,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['installDatabase'] = true; $this->session->process_validated = array('installDatabase' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -173,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['populateDatabase'] = true; $this->session->process_validated = array('populateDatabase' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -205,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['configureShop'] = true; $this->session->process_validated = array('configureShop' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -220,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['installModules'] = true; $this->session->process_validated = array('installModules' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -251,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['installTheme'] = true; $this->session->process_validated = array('installTheme' => true);
$this->ajaxJsonAnswer(true); $this->ajaxJsonAnswer(true);
} }
@@ -308,7 +310,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
$low_memory = Tools::getMemoryLimit() < Tools::getOctets('42M'); $low_memory = Tools::getMemoryLimit() < Tools::getOctets('42M');
// We fill the process step used for Ajax queries // We fill the process step used for Ajax queries
$this->process_steps = array();
$this->process_steps[] = array('key' => 'generateSettingsFile', 'lang' => $this->l('Create settings.inc file')); $this->process_steps[] = array('key' => 'generateSettingsFile', 'lang' => $this->l('Create settings.inc file'));
$this->process_steps[] = array('key' => 'installDatabase', 'lang' => $this->l('Create database tables')); $this->process_steps[] = array('key' => 'installDatabase', 'lang' => $this->l('Create database tables'));
$this->process_steps[] = array('key' => 'installDefaultData', 'lang' => $this->l('Create default shop and languages')); $this->process_steps[] = array('key' => 'installDefaultData', 'lang' => $this->l('Create default shop and languages'));