Index: library/Zend/Locale/Data.php =================================================================== --- library/Zend/Locale/Data.php (revision 24765) +++ library/Zend/Locale/Data.php (working copy) @@ -361,7 +361,7 @@ break; case 'type': - if (empty($type)) { + if (empty($value)) { $temp = self::_getFile($locale, '/ldml/localeDisplayNames/types/type', 'type'); } else { if (($value == 'calendar') or Index: tests/Zend/Locale/DataTest.php =================================================================== --- tests/Zend/Locale/DataTest.php (revision 24765) +++ tests/Zend/Locale/DataTest.php (working copy) @@ -2733,4 +2733,34 @@ $value = Zend_Locale_Data::getContent('de_AT', 'unit', array('day', 'one')); $this->assertEquals('{0} Tag', $value); } + + /** + * @group ZF-12103 + */ + public function testGetListNonexistentTypeReturnsEmptyArray() + { + $result = Zend_Locale_Data::getList('de_AT', 'type', 'ddd'); + $this->assertTrue(is_array($result)); + $this->assertTrue(empty($result)); + } + + /** + * @group ZF-12103 + */ + public function testGetListValidTypeReturnsNonemptyArray() + { + $result = Zend_Locale_Data::getList('de_AT', 'type', 'calendar'); + $this->assertTrue(is_array($result)); + $this->assertTrue(count($result) > 0); + } + + /** + * @group ZF-12103 + */ + public function testGetListEmptyTypeReturnsNonemptyArray() + { + $result = Zend_Locale_Data::getList('de_AT', 'type', ''); + $this->assertTrue(is_array($result)); + $this->assertTrue(count($result) > 0); + } }