Merge pull request #700 from eMerzh/fix_error_display

Quick Fix a dirty function preventing showing errors
remotes/origin/stable5
Thomas Müller 14 years ago
commit 521b6c7b04
  1. 24
      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();
}
}

Loading…
Cancel
Save