[Pkg-owncloud-commits] [owncloud] 183/394: Fix a dirty function preventing showing errors
David Prévot
taffit at alioth.debian.org
Fri Nov 8 23:11:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.
commit 39dbecdc104c466687b16bc3d0eed68708f091f4
Author: Brice Maron <brice at bmaron.net>
Date: Mon Dec 3 22:53:06 2012 +0000
Fix a dirty function preventing showing errors
---
lib/template.php | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/lib/template.php b/lib/template.php
index 5d8baca..f58e6e6 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -484,16 +484,13 @@ class OC_Template{
}
/**
- * @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;
+ * @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();
}
-
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list