Fix for ZF-6878

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@16189 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Application/Resource/Locale.php

@@ -60,10 +60,12 @@ class Zend_Application_Resource_Locale
     {
         if (null === $this->_locale) {
             $options = $this->getOptions();
-            if (isset($options['default'])) {
+            if (!isset($options['default'])) {
+                $this->_locale = new Zend_Locale();
+            } else { 
                 Zend_Locale::setDefault($options['default']);
+                $this->_locale = new Zend_Locale($options['default']);
             }
-            $this->_locale = new Zend_Locale();
 
             $key = (isset($options['registry_key']) && !is_numeric($options['registry_key']))
                 ? $options['registry_key']

tests/Zend/Application/Resource/LocaleTest.php

@@ -103,7 +103,7 @@ class Zend_Application_Resource_LocaleTest extends PHPUnit_Framework_TestCase
     public function testOptionsPassedToResourceAreUsedToSetLocaleState()
     {
         $options = array(
-            'default'      => 'en_US',
+            'default'      => 'kok_IN',
             'registry_key' => 'Foo_Bar',
         );
 
@@ -111,7 +111,7 @@ class Zend_Application_Resource_LocaleTest extends PHPUnit_Framework_TestCase
         $resource->setBootstrap($this->bootstrap);
         $resource->init();
         $locale   = $resource->getLocale();
-        $this->assertEquals('en', $locale->__toString());
+        $this->assertEquals('kok_IN', $locale->__toString());
         $this->assertTrue(Zend_Registry::isRegistered('Foo_Bar'));
         $this->assertSame(Zend_Registry::get('Foo_Bar'), $locale);
     }