Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable

Fix undefined variable $tmpRoot
This commit is contained in:
Lukas Reschke 2017-09-13 22:42:42 +02:00 committed by GitHub
commit 8ef4fcb4b7

View file

@ -128,14 +128,14 @@ class CSSResourceLocator extends ResourceLocator {
'webRoot' => $webRoot,
'throw' => $throw ? 'true' : 'false'
]);
if ($throw) {
throw new ResourceNotFoundException($file, $webRoot);
}
}
}
if ($throw && $tmpRoot === '/') {
throw new ResourceNotFoundException($file, $webRoot);
}
$this->resources[] = array($tmpRoot, $webRoot, $file);
$this->resources[] = array($webRoot? : '/', $webRoot, $file);
}
}
}