diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-03-20 14:56:02 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-03-20 14:56:02 +0100 |
| commit | a45e45df1ec357f9b390463ed74100e6c8b07fe7 (patch) | |
| tree | 659bc1a68086658e060b2b5d7fde9347552d3de1 /lib | |
| parent | e44ab2dcfed7a613af145174ee93668c931adf56 (diff) | |
| parent | fa1be7d29663166194b1059e24d0e319abdb47cd (diff) | |
| download | nextcloud-server-a45e45df1ec357f9b390463ed74100e6c8b07fe7.tar.gz nextcloud-server-a45e45df1ec357f9b390463ed74100e6c8b07fe7.zip | |
Merge pull request #14941 from AdamWill/pipeline-apps
fall back to absolute path for pipelined assets (#14940)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/templatelayout.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 3220d9d969c..3f8422b9f0b 100644 --- a/lib/private/templatelayout.php +++ b/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); |