Merge pull request #14941 from AdamWill/pipeline-apps
fall back to absolute path for pipelined assets (#14940)
This commit is contained in:
commit
a45e45df1e
|
@ -242,7 +242,11 @@ class OC_TemplateLayout extends OC_Template {
|
||||||
|
|
||||||
private static function hashFileNames($files) {
|
private static function hashFileNames($files) {
|
||||||
foreach($files as $i => $file) {
|
foreach($files as $i => $file) {
|
||||||
$files[$i] = self::convertToRelativePath($file[0]).'/'.$file[2];
|
try {
|
||||||
|
$files[$i] = self::convertToRelativePath($file[0]).'/'.$file[2];
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
$files[$i] = $file[0].'/'.$file[2];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sort($files);
|
sort($files);
|
||||||
|
|
Loading…
Reference in New Issue