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

// Fix ISO detection on installer

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15920 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie committed 2012-06-07 12:34:25 +00:00
1 parent 133a92fd40
commit a123107d14
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/controllers/http/configure.php
+2 -2
View File
@@ -282,12 +282,12 @@ class InstallControllerHttpConfigure extends InstallControllerHttp
$this->list_countries[] = array('iso' => $iso, 'name' => $lang); $this->list_countries[] = array('iso' => $iso, 'name' => $lang);
// Try to detect default country // Try to detect default country
if (!$this->session->shop_country) if (1||!$this->session->shop_country)
{ {
$detect_language = $this->language->detectLanguage(); $detect_language = $this->language->detectLanguage();
if (isset($detect_language['primarytag'])) 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); $this->session->shop_timezone = $this->getTimezoneByIso($this->session->shop_country);
} }
} }