diff options
| -rwxr-xr-x | program/include/iniset.php | 6 | ||||
| -rw-r--r-- | program/include/main.inc | 2 | ||||
| -rw-r--r-- | program/include/rcmail.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/program/include/iniset.php b/program/include/iniset.php index 11e6d54b5..14cc87e54 100755 --- a/program/include/iniset.php +++ b/program/include/iniset.php @@ -57,9 +57,7 @@ if (!defined('PATH_SEPARATOR')) { // RC include folders MUST be included FIRST to avoid other // possible not compatible libraries (i.e PEAR) to be included // instead the ones provided by RC -$include_path = INSTALL_PATH . 'program' . PATH_SEPARATOR; -$include_path.= INSTALL_PATH . 'program/include' . PATH_SEPARATOR; -$include_path.= INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; +$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR; $include_path.= ini_get('include_path'); if (set_include_path($include_path) === false) { @@ -88,6 +86,7 @@ function rcube_autoload($classname) { $filename = preg_replace( array( + '/rcube_/', '/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', @@ -96,6 +95,7 @@ function rcube_autoload($classname) '/^utf8$/', ), array( + INSTALL_PATH . 'program/include/rcube_', 'MDB2/\\1', 'Mail/\\1', 'Net/\\1', diff --git a/program/include/main.inc b/program/include/main.inc index c13d91ffa..d7009c014 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -26,7 +26,7 @@ * @author Thomas Bruederli <roundcube@gmail.com> */ -require_once 'lib/utf7.inc'; +require_once 'utf7.inc'; require_once INSTALL_PATH . 'program/include/rcube_shared.inc'; // define constannts for input reading diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 9eb11e6c5..0e2928f0d 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1179,7 +1179,7 @@ class rcmail mcrypt_module_close($td); } else { - @include_once('lib/des.inc'); + @include_once 'des.inc'; if (function_exists('des')) { $des_iv_size = 8; @@ -1231,7 +1231,7 @@ class rcmail mcrypt_module_close($td); } else { - @include_once('lib/des.inc'); + @include_once 'des.inc'; if (function_exists('des')) { $des_iv_size = 8; |