update merge method in PhpMessageSource

ZAYEC77 · ZAYEC77 · commit e4bf4b66d8d2 · 2015-11-10T01:25:08.000+02:00
diff --git a/src/components/i18n/PhpMessageSource.php b/src/components/i18n/PhpMessageSource.php
@@ -27,7 +27,7 @@ protected function loadMessages($category, $language)
         if (!isset($this->_parentMessages[$key])) {
             $parent = Yii::$app->getI18n()->getMessageSource($category . '*');
             $oldMessages = $parent->loadMessages($category, $language);
-            $this->_parentMessages[$key] = ArrayHelper::merge($oldMessages, $messages);
+            $this->_parentMessages[$key] = array_merge($oldMessages, array_filter($messages));
         }
         return $this->_parentMessages[$key];
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected function loadMessages($category, $language)`
`27`	`27`	`if (!isset($this->_parentMessages[$key])) {`
`28`	`28`	`$parent = Yii::$app->getI18n()->getMessageSource($category . '*');`
`29`	`29`	`$oldMessages = $parent->loadMessages($category, $language);`
`30`		`- $this->_parentMessages[$key] = ArrayHelper::merge($oldMessages, $messages);`
	`30`	`+ $this->_parentMessages[$key] = array_merge($oldMessages, array_filter($messages));`
`31`	`31`	`}`
`32`	`32`	`return $this->_parentMessages[$key];`
`33`	`33`	`}`