From 581dcec7188126377642af33ae8cd0bf007436ea Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Mon, 5 Aug 2013 11:22:55 +0200
Subject: [PATCH] // [-] IN : Fixed language detection and help in the
 installer

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

diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php
index 1b35a3a9f..c600c04ad 100644
--- a/install-dev/controllers/http/configure.php
+++ b/install-dev/controllers/http/configure.php
@@ -56,7 +56,7 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
 				$params = http_build_query(array(
 					'email' => $this->session->admin_email,
 					'method' => 'addMemberToNewsletter',
-					'language' => $this->session->lang,
+					'language' => $this->language->getLanguageIso(),
 					'visitorType' => 1,
 					'source' => 'installer'
 				));
diff --git a/install-dev/theme/views/footer.phtml b/install-dev/theme/views/footer.phtml
index 58cce38bd..3f2f8d2ad 100644
--- a/install-dev/theme/views/footer.phtml
+++ b/install-dev/theme/views/footer.phtml
@@ -36,7 +36,8 @@
 			errors.push($(this).text().trim());
 		});
 		psuser_assistance.setStep('install_<?php echo addslashes($this->step) ?>', {'error':errors});
-		$('#iframe_help').attr('src', $('#iframe_help').attr('src') + '&errors=' + encodeURI(errors.join(', ')));
+		if (errors.length)
+			$('#iframe_help').attr('src', $('#iframe_help').attr('src') + '&errors=' + encodeURI(errors.join(', ')));
 	}
 </script>
 </body>
diff --git a/install-dev/theme/views/header.phtml b/install-dev/theme/views/header.phtml
index 4939c032a..0089b2570 100644
--- a/install-dev/theme/views/header.phtml
+++ b/install-dev/theme/views/header.phtml
@@ -73,7 +73,7 @@
 	</ol>
 	<?php if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3)): ?>
 		<iframe scrolling="no" style="height:210px;width:200px;border:none;margin-top:20px" id="iframe_help"
-			src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?>&country=<?php echo $this->session->shop_country ?>">
+			src="https://api.prestashop.com/iframe/install.php?step=<?php echo $this->step ?>&lang=<?php echo $this->language->getLanguageIso() ?><?php if (isset($this->session->shop_country)) echo '&country='.$this->session->shop_country; ?>">
 			<p><?php echo $this->l('Contact us!') ?><br /><?php echo $this->getPhone() ?></p>
 		</iframe>
 	<?php endif; ?>