From e4394c95e0a39607f4fdbd427b249b1e611ca0ff Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 18 Feb 2013 08:31:09 +0100
Subject: Make autoloading of the framework classes work from any location

---
 program/lib/Roundcube/bootstrap.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'program/lib/Roundcube/bootstrap.php')

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 8cea48122..ef221e34a 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -470,17 +470,17 @@ function rcube_autoload($classname)
             '/Mail_(.+)/',
             '/Net_(.+)/',
             '/Auth_(.+)/',
+            '/^utf8$/',
             '/^html_.+/',
             '/^rcube(.*)/',
-            '/^utf8$/',
         ),
         array(
             'Mail/\\1',
             'Net/\\1',
             'Auth/\\1',
-            'Roundcube/html',
-            'Roundcube/rcube\\1',
             'utf8.class',
+            RCUBE_LIB_DIR . '/html',
+            RCUBE_LIB_DIR . '/rcube\\1',
         ),
         $classname
     );
-- 
cgit v1.2.3