Merge pull request #60 from alexantr/master

Do not use prefix for default language.
codemix · Feb 25, 2016 · 40862f9 · 40862f9
2 parents cfdb9b6 + d384f11
commit 40862f9
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/UrlManager.php b/UrlManager.php
@@ -138,7 +138,7 @@ public function init()
             }
         }
         $this->_defaultLanguage = Yii::$app->language;
-        return parent::init();
+        parent::init();
     }
 
     /**
@@ -201,6 +201,15 @@ public function createUrl($params)
                 $languageRequired = false;
             }
 
+            // Do not use prefix for default language to prevent unnecessary redirect
+            if ($languageRequired
+                && $language === $this->getDefaultLanguage()
+                && !$this->enableDefaultLanguageUrlCode
+                && !$this->enableLanguagePersistence
+            ) {
+                $languageRequired = false;
+            }
+
             $url = parent::createUrl($params);
 
             // Unless a language was explicitely specified in the parameters we can return a URL without any prefix