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
112ad80d
Commit
112ad80d
authored
Nov 11, 2014
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed `yii\console\controllers\AssetController` breaks CSS URLs, which start from '/'
parent
1605905f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
AssetController.php
framework/console/controllers/AssetController.php
+1
-1
AssetControllerTest.php
...nit/framework/console/controllers/AssetControllerTest.php
+6
-0
No files found.
framework/CHANGELOG.md
View file @
112ad80d
...
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
...
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
-
Bug #4889: Application was getting into redirect loop when user wasn't allowed accessing login page. Now shows 403 (samdark)
-
Bug #4889: Application was getting into redirect loop when user wasn't allowed accessing login page. Now shows 403 (samdark)
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5402: Debugger was not loading when there were closures in asset classes (samdark)
-
Bug #5452: Errors occurring after the response is sent are not displayed (qiangxue)
-
Bug #5452: Errors occurring after the response is sent are not displayed (qiangxue)
-
Bug #5521: Fixed
`yii\console\controllers\AssetController`
breaks CSS URLs, which start from '/' (klimov-paul)
-
Bug #5570:
`yii\bootstrap\Tabs`
would throw an exception if
`content`
is not set for one of its
`items`
(RomeroMsk)
-
Bug #5570:
`yii\bootstrap\Tabs`
would throw an exception if
`content`
is not set for one of its
`items`
(RomeroMsk)
-
Bug #5584:
`yii\rbac\DbRbacManager`
should not delete items when deleting a rule on a database not supporting cascade update (mdmunir)
-
Bug #5584:
`yii\rbac\DbRbacManager`
should not delete items when deleting a rule on a database not supporting cascade update (mdmunir)
-
Bug #5601: Simple conditions in Query::where() and ActiveQuery::where() did not allow
`yii\db\Expression`
to be used as the value (cebe, stevekr)
-
Bug #5601: Simple conditions in Query::where() and ActiveQuery::where() did not allow
`yii\db\Expression`
to be used as the value (cebe, stevekr)
...
...
framework/console/controllers/AssetController.php
View file @
112ad80d
...
@@ -565,7 +565,7 @@ EOD;
...
@@ -565,7 +565,7 @@ EOD;
$fullMatch
=
$matches
[
0
];
$fullMatch
=
$matches
[
0
];
$inputUrl
=
$matches
[
1
];
$inputUrl
=
$matches
[
1
];
if
(
preg_match
(
'/^https?:\/\//is'
,
$inputUrl
)
||
preg_match
(
'/^data:/is'
,
$inputUrl
))
{
if
(
strpos
(
$inputUrl
,
'/'
)
===
0
||
preg_match
(
'/^https?:\/\//is'
,
$inputUrl
)
||
preg_match
(
'/^data:/is'
,
$inputUrl
))
{
return
$fullMatch
;
return
$fullMatch
;
}
}
...
...
tests/unit/framework/console/controllers/AssetControllerTest.php
View file @
112ad80d
...
@@ -386,6 +386,12 @@ EOL;
...
@@ -386,6 +386,12 @@ EOL;
'C:\test\base\path\assets\output'
,
'C:\test\base\path\assets\output'
,
'.published-same-dir-class {background-image: url(../input/published_same_dir.png);}'
,
'.published-same-dir-class {background-image: url(../input/published_same_dir.png);}'
,
],
],
[
'.static-root-relative-class {background-image: url(\'/images/static_root_relative.png\');}'
,
'/test/base/path/css'
,
'/test/base/path/assets/output'
,
'.static-root-relative-class {background-image: url(\'/images/static_root_relative.png\');}'
,
],
];
];
}
}
...
...
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