diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-09-13 22:42:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 22:42:42 +0200 |
| commit | 8ef4fcb4b70bf57c986154c2d78ad65e703e7c5a (patch) | |
| tree | e18cb9d47fe65e6d0e34d65d22744a47aaefe711 /lib/private | |
| parent | d659199ff5eb3aeae66155c9f151ffd81c697cd3 (diff) | |
| parent | 01d496713058e9ac44bda188a4334b7081ac7ce8 (diff) | |
| download | nextcloud-server-8ef4fcb4b70bf57c986154c2d78ad65e703e7c5a.tar.gz nextcloud-server-8ef4fcb4b70bf57c986154c2d78ad65e703e7c5a.zip | |
Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable
Fix undefined variable $tmpRoot
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Template/CSSResourceLocator.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index 1b4050e4ae0..e4b6890529e 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -128,14 +128,14 @@ class CSSResourceLocator extends ResourceLocator { 'webRoot' => $webRoot, 'throw' => $throw ? 'true' : 'false' ]); - } - } - if ($throw && $tmpRoot === '/') { - throw new ResourceNotFoundException($file, $webRoot); + if ($throw) { + throw new ResourceNotFoundException($file, $webRoot); + } + } } - $this->resources[] = array($tmpRoot, $webRoot, $file); + $this->resources[] = array($webRoot? : '/', $webRoot, $file); } } } |