Commit a45e45df authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #14941 from AdamWill/pipeline-apps

fall back to absolute path for pipelined assets (#14940)
parents e44ab2dc fa1be7d2
...@@ -242,7 +242,11 @@ class OC_TemplateLayout extends OC_Template { ...@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment