magento-fix-cli-installer-locale-saving-problem.patch

From eeed25bdbbbdb74fb81e243ef6714f4cb8a80094 Mon Sep 17 00:00:00 2001
From: Yevgeniy A. Viktorov <[email protected]>
Date: Fri, 1 May 2009 20:20:58 +0300
Subject: [PATCH] fix installer: locale saving problem

---
 app/code/core/Mage/Install/Model/Installer.php |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/app/code/core/Mage/Install/Model/Installer.php b/app/code/core/Mage/Install/Model/Installer.php
index 21bae0f..41d7d42 100644
--- a/app/code/core/Mage/Install/Model/Installer.php
+++ b/app/code/core/Mage/Install/Model/Installer.php
@@ -188,7 +188,13 @@ class Mage_Install_Model_Installer extends Varien_Object
         /**
          * Saving locale information into DB
          */
-        $locale = Mage::getSingleton('install/session')->getLocaleData();
+        if (defined('STDIN') && defined('STDOUT') && (defined('STDERR'))) {
+            $locale = $this->getDataModel()->getLocaleData();
+        }
+        else
+        {
+            $locale = Mage::getSingleton('install/session')->getLocaleData();
+        }
         if (!empty($locale['locale'])) {
             $setupModel->setConfigData(Mage_Core_Model_Locale::XML_PATH_DEFAULT_LOCALE, $locale['locale']);
         }
-- 
1.6.2.1