Browse Source

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).
remotes/origin/etag-endpoint
Adam Williamson 11 years ago
parent
commit
fa1be7d296
  1. 6
      lib/private/templatelayout.php

6
lib/private/templatelayout.php

@ -242,7 +242,11 @@ class OC_TemplateLayout extends OC_Template {
private static function hashFileNames($files) {
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);

Loading…
Cancel
Save