Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
a45e45df
Commit
a45e45df
authored
Mar 20, 2015
by
Morris Jobke
Browse files
Merge pull request #14941 from AdamWill/pipeline-apps
fall back to absolute path for pipelined assets (#14940)
parents
e44ab2dc
fa1be7d2
Changes
1
Show whitespace changes
Inline
Side-by-side
lib/private/templatelayout.php
View file @
a45e45df
...
...
@@ -242,7 +242,11 @@ class OC_TemplateLayout extends OC_Template {
private
static
function
hashFileNames
(
$files
)
{
foreach
(
$files
as
$i
=>
$file
)
{
try
{
$files
[
$i
]
=
self
::
convertToRelativePath
(
$file
[
0
])
.
'/'
.
$file
[
2
];
}
catch
(
\
Exception
$e
)
{
$files
[
$i
]
=
$file
[
0
]
.
'/'
.
$file
[
2
];
}
}
sort
(
$files
);
...
...
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