Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
24257e76
Commit
24257e76
authored
Jun 17, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #3909: `Html::to()` should not prefix base URL to URLs that already contain scheme
parent
ca0a1f05
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
BaseUrl.php
framework/helpers/BaseUrl.php
+7
-3
UrlTest.php
tests/unit/framework/helpers/UrlTest.php
+8
-0
No files found.
framework/CHANGELOG.md
View file @
24257e76
...
...
@@ -47,6 +47,7 @@ Yii Framework 2 Change Log
-
Bug #3817:
`yii\rbac\PhpManager::getChildren()`
returns null instead of expected empty array (qiangxue)
-
Bug #3843: Fixed Menu bug when using
`template`
with
`encodeLabel`
=> false (creocoder, umneeq)
-
Bug #3863: Fixed incorrect js selector for
`\yii\widgets\ActiveForm::errorSummaryCssClass`
when it contains multiple classes (creocoder, umneeq)
-
Bug #3909:
`Html::to()`
should not prefix base URL to URLs that already contain scheme (qiangxue)
-
Bug: Fixed inconsistent return of
`\yii\console\Application::runAction()`
(samdark)
-
Bug: URL encoding for the route parameter added to
`\yii\web\UrlManager`
(klimov-paul)
-
Bug: Fixed the bug that requesting protected or private action methods would cause 500 error instead of 404 (qiangxue)
...
...
framework/helpers/BaseUrl.php
View file @
24257e76
...
...
@@ -192,15 +192,19 @@ class BaseUrl
if
(
$url
===
''
)
{
$url
=
Yii
::
$app
->
getRequest
()
->
getUrl
();
}
elseif
(
$url
[
0
]
!==
'/'
&&
$url
[
0
]
!==
'#'
&&
$url
[
0
]
!==
'.'
&&
strpos
(
$url
,
'://'
)
===
false
)
{
}
else
{
$hasScheme
=
(
$pos
=
strpos
(
$url
,
':'
))
>
0
&&
ctype_alpha
(
substr
(
$url
,
0
,
$pos
));
$char
=
$url
[
0
];
if
(
$char
!==
'/'
&&
$char
!==
'#'
&&
$char
!==
'.'
&&
!
$hasScheme
)
{
$url
=
Yii
::
$app
->
getRequest
()
->
getBaseUrl
()
.
'/'
.
$url
;
}
}
if
(
$scheme
)
{
if
(
strpos
(
$url
,
'://'
)
===
false
)
{
if
(
empty
(
$hasScheme
)
)
{
$url
=
Yii
::
$app
->
getRequest
()
->
getHostInfo
()
.
'/'
.
ltrim
(
$url
,
'/'
);
}
if
(
is_string
(
$scheme
)
&&
(
$pos
=
strpos
(
$url
,
':
//
'
))
!==
false
)
{
if
(
is_string
(
$scheme
)
&&
(
$pos
=
strpos
(
$url
,
':'
))
!==
false
)
{
$url
=
$scheme
.
substr
(
$url
,
$pos
);
}
}
...
...
tests/unit/framework/helpers/UrlTest.php
View file @
24257e76
...
...
@@ -115,6 +115,14 @@ class UrlTest extends TestCase
\Yii
::
setAlias
(
'@web4'
,
'/test'
);
\Yii
::
setAlias
(
'@web5'
,
'#test'
);
$this
->
assertEquals
(
'/base/test/me1'
,
Url
::
to
(
'test/me1'
));
$this
->
assertEquals
(
'javascript:test/me1'
,
Url
::
to
(
'javascript:test/me1'
));
$this
->
assertEquals
(
'/base/java/script:test/me1'
,
Url
::
to
(
'java/script:test/me1'
));
$this
->
assertEquals
(
'#test/me1'
,
Url
::
to
(
'#test/me1'
));
$this
->
assertEquals
(
'.test/me1'
,
Url
::
to
(
'.test/me1'
));
$this
->
assertEquals
(
'http://example.com/base/test/me1'
,
Url
::
to
(
'test/me1'
,
true
));
$this
->
assertEquals
(
'https://example.com/base/test/me1'
,
Url
::
to
(
'test/me1'
,
'https'
));
$this
->
assertEquals
(
'http://test.example.com/test/me1'
,
Url
::
to
(
'@web1'
));
$this
->
assertEquals
(
'http://test.example.com/test/me1'
,
Url
::
to
(
'@web1'
,
true
));
$this
->
assertEquals
(
'https://test.example.com/test/me1'
,
Url
::
to
(
'@web1'
,
'https'
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment