From 44514562e98e1c297a02fd547d11dbe69e84c87b Mon Sep 17 00:00:00 2001
From: Albert Borsos <albertborsos@me.com>
Date: Thu, 31 May 2018 13:49:58 +0200
Subject: [PATCH] fix to handle different url rules in different languages for
 the same action

---
 UrlManager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UrlManager.php b/UrlManager.php
index d02a3ea..ab553bd 100644
--- a/UrlManager.php
+++ b/UrlManager.php
@@ -244,9 +244,10 @@ public function createUrl($params)
             $isLanguageGiven = isset($params[$this->languageParam]);
             $language = $isLanguageGiven ? $params[$this->languageParam] : Yii::$app->language;
             $isDefaultLanguage = $language === $this->getDefaultLanguage();
+            $isLinkRefersToBaseUrl = empty($params[0]);
 
-            if ($isLanguageGiven) {
-                unset($params[$this->languageParam]);
+            if (!$isLanguageGiven && !$isLinkRefersToBaseUrl) {
+                $params[$this->languageParam] = $language;
             }
 
             $url = parent::createUrl($params);