sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Catch exception from path info
pull/3580/head
Lukas Reschke 2017-02-22 12:15:50 +07:00 committed by GitHub
parent 182bfd9f23 899af7831e
commit 9e21a555cb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/TemplateLayout.php
Unescape Escape View File

@ -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,