From 2187b2b7d845f6c5b50e380447c034c830454e75 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 19 Feb 2013 03:08:33 -0500
Subject: [PATCH] Revert "Make autoloading of the framework classes work from any location". Allow loading rcube_* classes from other locations (for e.g. managesieve plugin).

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

diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index ef221e3..8cea481 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -470,17 +470,17 @@
             '/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
     );

--
Gitblit v1.9.1