From 899af7831ecd99b31a99e5aa3c6948f4bb550415 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 22 Feb 2017 11:01:40 +0100 Subject: [PATCH] Catch exception from path info We don't really care when the path info can not be gathered correctly. we will simply not use SCSS then but the CSS fallback. Signed-off-by: Joas Schilling --- lib/private/TemplateLayout.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index f162136323..ccd53c9caf 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -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,