php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 06:15:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prefer strpos to substr

Browse Source
This commit is contained in:
Alexander Makarov
2016-12-15 23:47:52 +03:00
committed by Carsten Brandt
parent c641513583
commit f9e83008f4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/web/UrlManager.php
View File

@ -396,7 +396,7 @@ class UrlManager extends Component
} else {
return $url . $baseUrl . $anchor;
}
} elseif (substr($url, 0, 2) === '//') {
} elseif (strpos($url, '//') === 0) {
if ($baseUrl !== '' && ($pos = strpos($url, '/', 2)) !== false) {
return substr($url, 0, $pos) . $baseUrl . substr($url, $pos) . $anchor;
} else {
@ -482,7 +482,7 @@ class UrlManager extends Component
$url = $this->createUrl($params);
if (strpos($url, '://') === false) {
$hostInfo = $this->getHostInfo();
if (substr($url, 0, 2) === '//') {
if (strpos($url, '//') === 0) {
$url = substr($hostInfo, 0, strpos($hostInfo, '://')) . ':' . $url;
} else {
$url = $hostInfo . $url;