diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-02-25 07:09:48 -0800 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-02-25 07:09:48 -0800 |
| commit | 2954c7e97a4d5744cb3b25f0401a16a8c28115f6 (patch) | |
| tree | c43d0a81b187aa221de49bc9f6409b54b24e03da /lib | |
| parent | 0f763f4508bf82e9e50713c6bc775a91ed3ad54c (diff) | |
| parent | 15f53250787c005fe38e0a615d6721180c6b8833 (diff) | |
| download | nextcloud-server-2954c7e97a4d5744cb3b25f0401a16a8c28115f6.tar.gz nextcloud-server-2954c7e97a4d5744cb3b25f0401a16a8c28115f6.zip | |
Merge pull request #1865 from owncloud/fix-displaying-db-errors
Don't use routes when displaying error page
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/template.php | 4 | ||||
| -rw-r--r-- | lib/templatelayout.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/template.php b/lib/template.php index 3df5a24f946..0f9efe66496 100644 --- a/lib/template.php +++ b/lib/template.php @@ -530,8 +530,10 @@ class OC_Template{ * @param string $hint An option hint message */ public static function printErrorPage( $error_msg, $hint = '' ) { + $content = new OC_Template( '', 'error', 'error' ); $errors = array(array('error' => $error_msg, 'hint' => $hint)); - OC_Template::printGuestPage("", "error", array("errors" => $errors)); + $content->assign( 'errors', $errors, false ); + $content->printPage(); die(); } } 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)) { |