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
1e3989e5
Commit
1e3989e5
authored
Apr 24, 2014
by
Michael Härtl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix call to AssetConverter::convert() in AssetBundle
parent
904c32eb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
AssetBundle.php
framework/web/AssetBundle.php
+2
-2
No files found.
framework/web/AssetBundle.php
View file @
1e3989e5
...
@@ -173,7 +173,7 @@ class AssetBundle extends Object
...
@@ -173,7 +173,7 @@ class AssetBundle extends Object
foreach
(
$this
->
js
as
$i
=>
$js
)
{
foreach
(
$this
->
js
as
$i
=>
$js
)
{
if
(
strpos
(
$js
,
'/'
)
!==
0
&&
strpos
(
$js
,
'://'
)
===
false
)
{
if
(
strpos
(
$js
,
'/'
)
!==
0
&&
strpos
(
$js
,
'://'
)
===
false
)
{
if
(
isset
(
$this
->
basePath
,
$this
->
baseUrl
))
{
if
(
isset
(
$this
->
basePath
,
$this
->
baseUrl
))
{
$this
->
js
[
$i
]
=
$converter
->
convert
(
$js
,
$this
->
basePath
,
$this
->
baseUrl
);
$this
->
js
[
$i
]
=
$converter
->
convert
(
$js
,
$this
->
basePath
);
}
else
{
}
else
{
$this
->
js
[
$i
]
=
'/'
.
$js
;
$this
->
js
[
$i
]
=
'/'
.
$js
;
}
}
...
@@ -182,7 +182,7 @@ class AssetBundle extends Object
...
@@ -182,7 +182,7 @@ class AssetBundle extends Object
foreach
(
$this
->
css
as
$i
=>
$css
)
{
foreach
(
$this
->
css
as
$i
=>
$css
)
{
if
(
strpos
(
$css
,
'/'
)
!==
0
&&
strpos
(
$css
,
'://'
)
===
false
)
{
if
(
strpos
(
$css
,
'/'
)
!==
0
&&
strpos
(
$css
,
'://'
)
===
false
)
{
if
(
isset
(
$this
->
basePath
,
$this
->
baseUrl
))
{
if
(
isset
(
$this
->
basePath
,
$this
->
baseUrl
))
{
$this
->
css
[
$i
]
=
$converter
->
convert
(
$css
,
$this
->
basePath
,
$this
->
baseUrl
);
$this
->
css
[
$i
]
=
$converter
->
convert
(
$css
,
$this
->
basePath
);
}
else
{
}
else
{
$this
->
css
[
$i
]
=
'/'
.
$css
;
$this
->
css
[
$i
]
=
'/'
.
$css
;
}
}
...
...
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