From a310dcb0ff4e787ea0a060db6960ba191f04a33f Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 3 Dec 2012 22:53:06 +0000
Subject: [PATCH] Fix a dirty function preventing showing errors
---
lib/template.php | 24 ++++++++++--------------
1 file 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();
+ }
}
--
GitLab