From a7aa8b561ff0e91197a523b3a539b6ded6f4ced5 Mon Sep 17 00:00:00 2001 From: alec Date: Mon, 13 Jun 2011 18:55:50 +0000 Subject: - Fix autoloading of Auth_SASL classes in Installer git-svn-id: https://svn.roundcube.net/trunk@4847 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/installer/utils.php | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/roundcubemail/installer/utils.php b/roundcubemail/installer/utils.php index fd7e93bec..b08a118a5 100644 --- a/roundcubemail/installer/utils.php +++ b/roundcubemail/installer/utils.php @@ -33,12 +33,26 @@ */ function __autoload($classname) { - $filename = preg_replace( - array('/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', '/^html_.+/', '/^utf8$/'), - array('MDB2/\\1', 'Mail/\\1', 'Net/\\1', 'html', 'utf8.class'), - $classname - ); - include_once $filename. '.php'; + $filename = preg_replace( + array( + '/MDB2_(.+)/', + '/Mail_(.+)/', + '/Net_(.+)/', + '/Auth_(.+)/', + '/^html_.+/', + '/^utf8$/' + ), + array( + 'MDB2/\\1', + 'Mail/\\1', + 'Net/\\1', + 'Auth/\\1', + 'html', + 'utf8.class' + ), + $classname + ); + include_once $filename. '.php'; } @@ -47,6 +61,6 @@ function __autoload($classname) */ function raise_error($p) { - $rci = rcube_install::get_instance(); - $rci->raise_error($p); + $rci = rcube_install::get_instance(); + $rci->raise_error($p); } -- cgit v1.2.3