Skip to content

Commit e6bf629

Browse files
committed
Fix UrlManager
- remove the slash on end of url
1 parent 8fdee38 commit e6bf629

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

UrlManager.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,14 @@
66
use bl\locale\receiver\ParamsLanguageReceive;
77
use bl\locale\receiver\ReceiveContainer;
88
use bl\locale\receiver\SessionLanguageReceive;
9-
use bl\locale\receiver\UrlLanguageReceive;
109
use bl\locale\saver\CookieLanguageSave;
1110
use bl\locale\saver\SaveConteiner;
1211
use bl\locale\saver\SessionLanguageSave;
1312
use yii\base\InvalidConfigException;
1413
use yii\base\InvalidValueException;
1514
use yii\di\Container;
1615
use yii\helpers\ArrayHelper;
17-
use yii\web\Cookie;
1816
use yii\web\NotFoundHttpException;
19-
use yii\web\UrlRule;
2017
use \yii\web\UrlManager as BaseUrlManager;
2118

2219
/**
@@ -217,9 +214,11 @@ public function createUrl($params)
217214
$language = $this->lowerCase ? strtolower($language) : $language;
218215
$language = $this->useShortSyntax ? preg_replace('~(\w{2})-\w{2}~i', '$1', $language, 1) : $language;
219216

217+
218+
$url = substr_replace(parent::createUrl($params), !empty($language) ? "/$language" : '', strlen($this->baseUrl), 0);
219+
$url = rtrim($url, '/');
220+
220221
return $this->showDefault || strcasecmp($language, $this->defaultLanguage) != 0
221-
? substr_replace(parent::createUrl($params), !empty($language) ? "/$language" : '', strlen($this->baseUrl), 0)
222-
: parent::createUrl($params);
222+
? $url : parent::createUrl($params);
223223
}
224-
225224
}

0 commit comments

Comments
 (0)