Skip to content
Snippets Groups Projects
Commit 9e21a555 authored by Lukas Reschke's avatar Lukas Reschke Committed by GitHub
Browse files

Merge pull request #3573 from nextcloud/correctly-catch-the-exception-from-pathinfo

Catch exception from path info
parents 182bfd9f 899af783
No related branches found
No related tags found
No related merge requests found
......@@ -159,11 +159,18 @@ class TemplateLayout extends \OC_Template {
$this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
}
try {
$pathInfo = \OC::$server->getRequest()->getPathInfo();
} catch (\Exception $e) {
$pathInfo = '';
}
// Do not initialise scss appdata until we have a fully installed instance
// Do not load scss for update, errors, installation or login page
if(\OC::$server->getSystemConfig()->getValue('installed', false)
&& !\OCP\Util::needUpgrade()
&& !preg_match('/^\/login/', \OC::$server->getRequest()->getPathInfo())) {
&& $pathInfo !== ''
&& !preg_match('/^\/login/', $pathInfo)) {
$cssFiles = self::findStylesheetFiles(\OC_Util::$styles);
} else {
// If we ignore the scss compiler,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment