MAGETWO-34390: Stabilization of replacing Zend_Locale with Native PHP Implementation

slavvka · slavvka · commit c09b314c052e · 2015-03-10T18:44:13.000+02:00
diff --git a/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php b/lib/internal/Magento/Framework/Locale/Bundle/DataBundle.php
@@ -28,7 +28,7 @@ public function get($locale)
         $class = get_class($this);
         if (!isset(static::$bundles[$class][$locale])) {
             $bundle = new \ResourceBundle($locale, $this->path);
-            if ($bundle->count() == 0 && $this->path != 'ICUDATA') {
+            if (!$bundle && $this->path != 'ICUDATA') {
                 $bundle = new \ResourceBundle($locale, 'ICUDATA');
             }
             static::$bundles[$class][$locale] = $bundle;

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function get($locale)`
`28`	`28`	`$class = get_class($this);`
`29`	`29`	`if (!isset(static::$bundles[$class][$locale])) {`
`30`	`30`	`$bundle = new \ResourceBundle($locale, $this->path);`
`31`		`- if ($bundle->count() == 0 && $this->path != 'ICUDATA') {`
	`31`	`+ if (!$bundle && $this->path != 'ICUDATA') {`
`32`	`32`	`$bundle = new \ResourceBundle($locale, 'ICUDATA');`
`33`	`33`	`}`
`34`	`34`	`static::$bundles[$class][$locale] = $bundle;`