From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts
---
installer/utils.php | 16 +++-------------
1 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/installer/utils.php b/installer/utils.php
index d559df1..ca2577c 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -45,26 +45,16 @@
include_once $filename. '.php';
}
-
-/**
- * Fake internal error handler to catch errors
- */
-function raise_error($p)
-{
- $rci = rcube_install::get_instance();
- $rci->raise_error($p);
-}
-
/**
* Local callback function for PEAR errors
*/
-function rcube_pear_error($err)
+function __pear_error($err)
{
- raise_error(array(
+ rcmail::raise_error(array(
'code' => $err->getCode(),
'message' => $err->getMessage(),
));
}
// set PEAR error handling (will also load the PEAR main class)
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'rcube_pear_error');
+PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, '__pear_error');
--
Gitblit v1.9.1