From 2a9231a2b1029279742c6ea8ae9c1b89672f927c Mon Sep 17 00:00:00 2001 From: rMalie Date: Thu, 7 Jun 2012 12:34:25 +0000 Subject: [PATCH] // Fix ISO detection on installer --- install-dev/controllers/http/configure.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-dev/controllers/http/configure.php b/install-dev/controllers/http/configure.php index ac1f41f8d..b71a81050 100644 --- a/install-dev/controllers/http/configure.php +++ b/install-dev/controllers/http/configure.php @@ -282,12 +282,12 @@ class InstallControllerHttpConfigure extends InstallControllerHttp $this->list_countries[] = array('iso' => $iso, 'name' => $lang); // Try to detect default country - if (!$this->session->shop_country) + if (1||!$this->session->shop_country) { $detect_language = $this->language->detectLanguage(); if (isset($detect_language['primarytag'])) { - $this->session->shop_country = (isset($detect_language['subtag'])) ? $detect_language['subtag'] : $detect_language['primarytag']; + $this->session->shop_country = strtolower(isset($detect_language['subtag']) ? $detect_language['subtag'] : $detect_language['primarytag']); $this->session->shop_timezone = $this->getTimezoneByIso($this->session->shop_country); } }