Merge pull request #60 from alexantr/master

mikehaertl · mikehaertl · commit 40862f92bf38 · 2016-02-25T09:53:06.000+01:00
Do not use prefix for default language.
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

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function init()`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`$this->_defaultLanguage = Yii::$app->language;`
`141`		`- return parent::init();`
	`141`	`+ parent::init();`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`/**`
`@@ -201,6 +201,15 @@ public function createUrl($params)`
`201`	`201`	`$languageRequired = false;`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ // Do not use prefix for default language to prevent unnecessary redirect`
	`205`	`+ if ($languageRequired`
	`206`	`+ && $language === $this->getDefaultLanguage()`
	`207`	`+ && !$this->enableDefaultLanguageUrlCode`
	`208`	`+ && !$this->enableLanguagePersistence`
	`209`	`+ ) {`
	`210`	`+ $languageRequired = false;`
	`211`	`+ }`
	`212`	`+`
`204`	`213`	`$url = parent::createUrl($params);`
`205`	`214`
`206`	`215`	`// Unless a language was explicitely specified in the parameters we can return a URL without any prefix`