From 9e703356f10b248da39de2bae1cee2c510b5a7c5 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 14 Sep 2012 15:46:55 +0000
Subject: [PATCH] //fixed bug due to specific configuration or php version

---
 install-dev/controllers/http/configure.php |  3 +++
 install-dev/controllers/http/process.php   | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index 5b21c1024..a562d3da0 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -30,6 +30,9 @@
  */
 class InstallControllerHttpConfigure extends InstallControllerHttp
 {
+	
+	public $list_countries = array();
+	
 	/**
 	 * @see InstallAbstractModel::processNextStep()
 	 */
diff --git a/install-dev/controllers/http/process.php b/install-dev/controllers/http/process.php
index 902a6e56d..4603d5157 100644
--- a/install-dev/controllers/http/process.php
+++ b/install-dev/controllers/http/process.php
@@ -33,7 +33,9 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 	 * @var InstallModelInstall
 	 */
 	protected $model_install;
-
+	
+	public $process_steps = array();
+	
 	public $previous_button = false;
 
 	public function init()
@@ -130,7 +132,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 
 		if (!$success)
 			$this->ajaxJsonAnswer(false);
-		$this->session->process_validated['generateSettingsFile'] = true;
+		$this->session->process_validated = array('generateSettingsFile' => 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())
 			$this->ajaxJsonAnswer(false, $this->model_install->getErrors());
-		$this->session->process_validated['installDatabase'] = true;
+		$this->session->process_validated = array('installDatabase' => true);
 		$this->ajaxJsonAnswer(true);
 	}
 
@@ -173,7 +175,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		if (!$result || $this->model_install->getErrors())
 			$this->ajaxJsonAnswer(false, $this->model_install->getErrors());
 		$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);
 	}
 
@@ -205,7 +207,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 
 		if (!$success || $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);
 	}
 
@@ -220,7 +222,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		$result = $this->model_install->installModules(Tools::getValue('module'));
 		if (!$result || $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);
 	}
 
@@ -251,7 +253,7 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		if ($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);
 	}
 
@@ -308,7 +310,6 @@ class InstallControllerHttpProcess extends InstallControllerHttp
 		$low_memory = Tools::getMemoryLimit() < Tools::getOctets('42M');
 
 		// 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' => 'installDatabase', 'lang' => $this->l('Create database tables'));
 		$this->process_steps[] = array('key' => 'installDefaultData', 'lang' => $this->l('Create default shop and languages'));