Commit fa1be7d2 authored by Adam Williamson's avatar Adam Williamson
Browse files

fall back to absolute path for pipelined assets (#14940)

If the asset is, for example, in an apps directory that is
outside the $SERVERROOT, we won't be able to get a relative
path. We shouldn't just fail hard in this case. Fall back to
using the absolute path instead (as we used to).
parent fc0aa0b6
...@@ -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