mirror of
https://github.com/yiisoft/yii2.git
synced 2025-11-03 13:58:55 +08:00
yii\console\controllers\AssetController fixed to respect data URL resources
This commit is contained in:
@ -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 #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 #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 #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)
|
- 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 #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)
|
- Enh #3108: Added `yii\debug\Module::enableDebugLogs` to disable logging debug logs by default (qiangxue)
|
||||||
|
|||||||
@ -537,7 +537,7 @@ EOD;
|
|||||||
$fullMatch = $matches[0];
|
$fullMatch = $matches[0];
|
||||||
$inputUrl = $matches[1];
|
$inputUrl = $matches[1];
|
||||||
|
|
||||||
if (preg_match('/https?:\/\//is', $inputUrl)) {
|
if (preg_match('/^https?:\/\//is', $inputUrl) || preg_match('/^data:/is', $inputUrl)) {
|
||||||
return $fullMatch;
|
return $fullMatch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -356,6 +356,16 @@ EOL;
|
|||||||
src: url('../input/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype');
|
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');
|
||||||
|
}",
|
||||||
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user