diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-02-22 21:39:44 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-02-22 21:39:44 +0100 |
| commit | 15f53250787c005fe38e0a615d6721180c6b8833 (patch) | |
| tree | 6bad9043ec95402c8180c8725ce950a49fc2891e /lib/templatelayout.php | |
| parent | 78fce834058a38a7dbcc5310e16095c743434bc6 (diff) | |
| download | nextcloud-server-15f53250787c005fe38e0a615d6721180c6b8833.tar.gz nextcloud-server-15f53250787c005fe38e0a615d6721180c6b8833.zip | |
Don't use routes when displaying error page
Diffstat (limited to 'lib/templatelayout.php')
| -rw-r--r-- | lib/templatelayout.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 25d4033d9ee..afa875b0a6d 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -31,7 +31,7 @@ class OC_TemplateLayout extends OC_Template { } $user_displayname = OC_User::getDisplayName(); $this->assign( 'user_displayname', $user_displayname ); - } else if ($renderas == 'guest') { + } else if ($renderas == 'guest' || $renderas == 'error') { parent::__construct('core', 'layout.guest'); } else { parent::__construct('core', 'layout.base'); @@ -39,7 +39,7 @@ class OC_TemplateLayout extends OC_Template { // Add the js files $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); - if (OC_Config::getValue('installed', false)) { + if (OC_Config::getValue('installed', false) && $renderas!='error') { $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config')); } if (!empty(OC_Util::$core_scripts)) { |