diff options
author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
---|---|---|
committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /program/lib/Roundcube/bootstrap.php | |
parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'program/lib/Roundcube/bootstrap.php')
-rw-r--r-- | program/lib/Roundcube/bootstrap.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 65ef98ebd..98bbce5d4 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -58,7 +58,7 @@ define('RCUBE_VERSION', '1.1-git'); define('RCUBE_CHARSET', 'UTF-8'); if (!defined('RCUBE_LIB_DIR')) { - define('RCUBE_LIB_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); + define('RCUBE_LIB_DIR', dirname(__FILE__) . '/'); } if (!defined('RCUBE_INSTALL_PATH')) { @@ -464,16 +464,14 @@ function rcube_autoload($classname) '/Net_(.+)/', '/Auth_(.+)/', '/^html_.+/', - '/^rcube(.*)/', - '/^utf8$/', + '/^rcube(.*)/' ), array( 'Mail/\\1', 'Net/\\1', 'Auth/\\1', 'Roundcube/html', - 'Roundcube/rcube\\1', - 'utf8.class', + 'Roundcube/rcube\\1' ), $classname ); |