From af855321ab16045d94baded6b079ac138fbca51f Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 20 Jun 2012 08:36:51 +0000 Subject: [PATCH] // Fix default id lang in localization packs --- classes/LocalizationPack.php | 6 +++++- classes/db/Db.php | 4 ++-- install-dev/models/install.php | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index abde69a17..da39417f3 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.php @@ -58,7 +58,11 @@ class LocalizationPackCore $res &= $this->_installLanguages($xml, $install_mode); if ($res && isset($this->iso_code_lang)) - Configuration::updateValue('PS_LANG_DEFAULT', (int)Language::getIdByIso($this->iso_code_lang)); + { + if (!$id_lang = (int)Language::getIdByIso($this->iso_code_lang)) + $id_lang = 1; + Configuration::updateValue('PS_LANG_DEFAULT', $id_lang); + } if ($install_mode && $res && isset($this->iso_currency)) { diff --git a/classes/db/Db.php b/classes/db/Db.php index d51cf7c0b..761ff8b2d 100644 --- a/classes/db/Db.php +++ b/classes/db/Db.php @@ -25,8 +25,8 @@ * International Registered Trademark & Property of PrestaShop SA */ -if (file_exists(dirname(__FILE__).'/../config/settings.inc.php')) - include_once(dirname(__FILE__).'/../config/settings.inc.php'); +if (file_exists(dirname(__FILE__).'/../../config/settings.inc.php')) + include_once(dirname(__FILE__).'/../../config/settings.inc.php'); abstract class DbCore { diff --git a/install-dev/models/install.php b/install-dev/models/install.php index 8da9bebf3..7814950d0 100644 --- a/install-dev/models/install.php +++ b/install-dev/models/install.php @@ -186,7 +186,8 @@ class InstallModelInstall extends InstallAbstractModel } $flip_languages = array_flip($languages); - Configuration::updateGlobalValue('PS_LANG_DEFAULT', $flip_languages[$this->language->getLanguageIso()]); + $id_lang = (!empty($flip_languages[$this->language->getLanguageIso()])) ? $flip_languages[$this->language->getLanguageIso()] : 1; + Configuration::updateGlobalValue('PS_LANG_DEFAULT', $id_lang); return true; }