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
93514690
Commit
93514690
authored
Oct 21, 2014
by
Dima Vasilyev
Committed by
Qiang Xue
Oct 22, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #5682: The `asset` command would incorrectly combine CSS files when…
Fixes #5682: The `asset` command would incorrectly combine CSS files when `UrlManager::linkAssets` is true
parent
36ea0f32
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG.md
framework/CHANGELOG.md
+1
-0
AssetController.php
framework/console/controllers/AssetController.php
+1
-1
No files found.
framework/CHANGELOG.md
View file @
93514690
...
@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
...
@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
-
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)
-
Bug #5657:
`yii\caching\ApcCache::mset()`
and
`madd()`
may cause warning in some APC setup (LAV45)
-
Bug #5657:
`yii\caching\ApcCache::mset()`
and
`madd()`
may cause warning in some APC setup (LAV45)
-
Bug #5665: The
`currentPage`
meta data in the RESTful result should be 1-based, similar to that in HTTP headers (qiangxue)
-
Bug #5665: The
`currentPage`
meta data in the RESTful result should be 1-based, similar to that in HTTP headers (qiangxue)
-
Bug #5682: The
`asset`
command would incorrectly combine CSS files when
`UrlManager::linkAssets`
is true (dmvslv)
-
Bug: Gii console command help information does not contain global options (qiangxue)
-
Bug: Gii console command help information does not contain global options (qiangxue)
-
Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue)
-
Enh #5223: Query builder now supports selecting sub-queries as columns (qiangxue)
-
Enh #5587:
`json_encode`
is now used with
`JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE`
where it makes sense, also
-
Enh #5587:
`json_encode`
is now used with
`JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE`
where it makes sense, also
...
...
framework/console/controllers/AssetController.php
View file @
93514690
...
@@ -514,7 +514,7 @@ EOD;
...
@@ -514,7 +514,7 @@ EOD;
$content
=
''
;
$content
=
''
;
foreach
(
$inputFiles
as
$file
)
{
foreach
(
$inputFiles
as
$file
)
{
$content
.=
"/*** BEGIN FILE:
$file
***/
\n
"
$content
.=
"/*** BEGIN FILE:
$file
***/
\n
"
.
$this
->
adjustCssUrl
(
file_get_contents
(
$file
),
dirname
(
realpath
(
$file
)
),
dirname
(
$outputFile
))
.
$this
->
adjustCssUrl
(
file_get_contents
(
$file
),
dirname
(
$file
),
dirname
(
$outputFile
))
.
"/*** END FILE:
$file
***/
\n
"
;
.
"/*** END FILE:
$file
***/
\n
"
;
}
}
if
(
!
file_put_contents
(
$outputFile
,
$content
))
{
if
(
!
file_put_contents
(
$outputFile
,
$content
))
{
...
...
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