summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-02-19 09:08:33 +0100
committerAleksander Machniak <alec@alec.pl>2013-02-19 09:08:33 +0100
commit2187b2b7d845f6c5b50e380447c034c830454e75 (patch)
tree6568e3278cbaedebf729907456ddabf7fca5fa04 /program
parent7bba0032fe0318399e3522687a3b1ff3a4887486 (diff)
Revert "Make autoloading of the framework classes work from any location".
Allow loading rcube_* classes from other locations (for e.g. managesieve plugin). This reverts commit e4394c95e0a39607f4fdbd427b249b1e611ca0ff.
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/bootstrap.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index ef221e34a..8cea48122 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
);