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
72aba342
Commit
72aba342
authored
Apr 17, 2014
by
Klimov Paul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
`yii\console\controllers\AssetController` fixed to respect data URL resources
parent
650440d9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
1 deletion
+12
-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
+10
-0
No files found.
framework/CHANGELOG.md
View file @
72aba342
...
...
@@ -8,6 +8,7 @@ Yii Framework 2 Change Log
-
Bug #3066:
`yii\db\mssql\Schema::getTableSchema()`
should return null when the table does not exist (qiangxue)
-
Bug #3091: Fixed inconsistent treatment of
`Widget::run()`
when a widget is used as a container and as a self-contained object (qiangxue)
-
Bug #3121:
`yii\base\Application::bootstrap`
may fail to load some components if they are specified as class names (qiangxue)
-
Bug #3125:
`yii\console\controllers\AssetController`
now respects data URL resources (klimov-paul)
-
Bug #3128: Fixed the bug that
`defaultRoles`
set in RBAC manager was not working as specified (qiangxue)
-
Enh #3103: debugger panel is now not displayed when printing a page (githubjeka)
-
Enh #3108: Added
`yii\debug\Module::enableDebugLogs`
to disable logging debug logs by default (qiangxue)
...
...
framework/console/controllers/AssetController.php
View file @
72aba342
...
...
@@ -537,7 +537,7 @@ EOD;
$fullMatch
=
$matches
[
0
];
$inputUrl
=
$matches
[
1
];
if
(
preg_match
(
'/
https?:\/\/
/is'
,
$inputUrl
))
{
if
(
preg_match
(
'/
^https?:\/\//is'
,
$inputUrl
)
||
preg_match
(
'/^data:
/is'
,
$inputUrl
))
{
return
$fullMatch
;
}
...
...
tests/unit/framework/console/controllers/AssetControllerTest.php
View file @
72aba342
...
...
@@ -356,6 +356,16 @@ EOL;
src: url('../input/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype');
}"
,
],
[
"@font-face {
src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT==) format('truetype');
}"
,
'/test/base/path/assets/input/css'
,
'/test/base/path/assets/output'
,
"@font-face {
src: url(data:application/x-font-ttf;charset=utf-8;base64,AAEAAAALAIAAAwAwT==) format('truetype');
}"
,
],
];
}
...
...
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