wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #700 from eMerzh/fix_error_display

Browse source 
Quick Fix a dirty function preventing showing errors
This commit is contained in:
Thomas Müller 2012-12-05 01:37:27 -08:00
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();
}
/**
* @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();
}
}