Update method LanguageUrlTrait::getLanguage()

lav45 · Jul 31, 2016 · ed86f9f · ed86f9f
1 parent bd0d146
commit ed86f9f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/web/LanguageUrlTrait.php b/src/web/LanguageUrlTrait.php
@@ -36,7 +36,7 @@ trait LanguageUrlTrait
     public function getLanguage()
     {
         if ($this->_language === null) {
-            $this->_language = $this->getPrimaryLanguage(Yii::$app->language);
+            $this->setLanguage(Yii::$app->language);
         }
         return $this->_language;
     }
@@ -46,7 +46,7 @@ public function getLanguage()
      */
     public function setLanguage($locale)
     {
-        $this->_language = empty($locale) ? null : $this->getPrimaryLanguage($locale);
+        $this->_language = $this->getPrimaryLanguage($locale);
     }
 
     /**