diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-12-05 01:37:27 -0800 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-12-05 01:37:27 -0800 |
commit | 521b6c7b049ebd8ce1cf61017f160fb693429dd6 (patch) | |
tree | 05fc00279bc5e7f32753ea3008f1ebc1f23ba067 /lib | |
parent | 524f3c3c0bf2545ba82f9e98da6708335db15027 (diff) | |
parent | a310dcb0ff4e787ea0a060db6960ba191f04a33f (diff) | |
download | nextcloud-server-521b6c7b049ebd8ce1cf61017f160fb693429dd6.tar.gz nextcloud-server-521b6c7b049ebd8ce1cf61017f160fb693429dd6.zip |
Merge pull request #700 from eMerzh/fix_error_display
Quick Fix a dirty function preventing showing errors
Diffstat (limited to 'lib')
-rw-r--r-- | lib/template.php | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/template.php b/lib/template.php index 868d5f2ba2e..04667d73a2c 100644 --- a/lib/template.php +++ b/lib/template.php @@ -497,18 +497,14 @@ class OC_Template{ return $content->printPage(); } - /** - * @brief Print a fatal error page and terminates the script - * @param string $error The error message to show - * @param string $hint An option hint message - */ - public static function printErrorPage( $error, $hint = '' ) { - $error['error']=$error; - $error['hint']=$hint; - $errors[]=$error; - OC_Template::printGuestPage("", "error", array("errors" => $errors)); - die(); - } - - + /** + * @brief Print a fatal error page and terminates the script + * @param string $error The error message to show + * @param string $hint An option hint message + */ + public static function printErrorPage( $error_msg, $hint = '' ) { + $errors = array(array('error' => $error_msg, 'hint' => $hint)); + OC_Template::printGuestPage("", "error", array("errors" => $errors)); + die(); + } } |