From 863dbd0a94efb89100f4ba9699c44f63d9fa67ca Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Mon, 13 Feb 2012 09:38:50 +0000
Subject: [PATCH] // Fix countries list in installer

---
 install-dev/controllers/http/configure.php | 6 +++---
 install-dev/theme/views/configure.phtml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index 93874ef0c..5011d370e 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -284,11 +284,11 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 		);
 
 		foreach ($top_countries as $iso)
-			$this->list_countries[$iso] = $countries[$iso];
-		$this->list_countries[0] = '-----------------';
+			$this->list_countries[] = array('iso' => $iso, 'name' => $countries[$iso]);
+		$this->list_countries[] = array('name' => '-----------------');
 
 		foreach ($countries as $iso => $lang)
-			$this->list_countries[$iso] = $lang;
+			$this->list_countries[] = array('iso' => $iso, 'name' => $lang);
 
 
 		// Install type
diff --git a/install-dev/theme/views/configure.phtml b/install-dev/theme/views/configure.phtml
index 12fe5db2c..259913fd0 100644
--- a/install-dev/theme/views/configure.phtml
+++ b/install-dev/theme/views/configure.phtml
@@ -56,8 +56,8 @@ var default_iso = '<?php echo $this->session->shop_country ?>';
 		<div class="contentinput">
 			<select name="shop_country" id="infosCountry">
 				<option value="0">-- <?php echo $this->l('Select your country') ?> --</option>
-				<?php foreach ($this->list_countries as $iso => $country_name): ?>
-					<option value="<?php echo $iso ?>" <?php if ($this->session->shop_country && $this->session->shop_country == $iso): ?>selected="selected"<?php endif; ?>><?php echo $country_name ?></option>
+				<?php foreach ($this->list_countries as $country): ?>
+					<option value="<?php echo (isset($country['iso'])) ? $country['iso'] : '' ?>" <?php if ($this->session->shop_country && isset($country['iso']) && $this->session->shop_country === $country['iso']): ?>selected="selected"<?php endif; ?>><?php echo $country['name'] ?></option>
 				<?php endforeach; ?>
 			</select>
 			<sup class="required">*</sup>