mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #700 from eMerzh/fix_error_display 

Quick Fix a dirty function preventing showing errors
This commit is contained in:
Thomas Müller 2012-12-05 01:37:27 -08:00
parent 524f3c3c0b a310dcb0ff
commit 521b6c7b04
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/template.php
View File

@ -497,18 +497,14 @@ class OC_Template{
return $content->printPage(); return $content->printPage();
} }
/** /**
* @brief Print a fatal error page and terminates the script * @brief Print a fatal error page and terminates the script
* @param string $error The error message to show * @param string $error The error message to show
* @param string $hint An option hint message * @param string $hint An option hint message
*/ */
public static function printErrorPage( $error, $hint = '' ) { public static function printErrorPage( $error_msg, $hint = '' ) {
$error['error']=$error; $errors = array(array('error' => $error_msg, 'hint' => $hint));
$error['hint']=$hint; OC_Template::printGuestPage("", "error", array("errors" => $errors));
$errors[]=$error; die();
OC_Template::printGuestPage("", "error", array("errors" => $errors)); }
die();
}
} }