- Merge devel-framework branch, resolved conflicts

git-svn-id: https://svn.roundcube.net/trunk@6073 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 5 insertions, 13 deletions

diff --git a/roundcubemail/installer/index.php b/roundcubemail/installer/index.php
index 65e84a3b4..842b90054 100644
--- a/roundcubemail/installer/index.php
+++ b/roundcubemail/installer/index.php
@@ -53,6 +53,8 @@ $include_path .= ini_get('include_path');
 set_include_path($include_path);
 
 require_once 'utils.php';
+require_once 'rcube_shared.inc';
+// deprecated aliases (to be removed)
 require_once 'main.inc';
 
 session_start();
diff --git a/roundcubemail/installer/utils.php b/roundcubemail/installer/utils.php
index d559df14e..ca2577c14 100644
--- a/roundcubemail/installer/utils.php
+++ b/roundcubemail/installer/utils.php
@@ -45,26 +45,16 @@ function __autoload($classname)
     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');