diff options
| -rw-r--r-- | program/lib/Roundcube/bootstrap.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 182ea1232..3f4d2c387 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -58,7 +58,7 @@ define('RCUBE_VERSION', '1.0-git'); define('RCUBE_CHARSET', 'UTF-8'); if (!defined('RCUBE_LIB_DIR')) { - define('RCUBE_LIB_DIR', dirname(__FILE__).'/'); + define('RCUBE_LIB_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); } if (!defined('RCUBE_INSTALL_PATH')) { @@ -83,6 +83,13 @@ if (extension_loaded('mbstring')) { @mb_regex_encoding(RCUBE_CHARSET); } +// make sure the Roundcube lib directory is in the include_path +$rcube_include_path = realpath(RCUBE_LIB_DIR . '..'); +$sep = PATH_SEPARATOR; +if (!preg_match("!(^|$sep)$rcube_include_path($sep|\$)!", ini_get('include_path'))) { + set_include_path(ini_get('include_path') . PATH_SEPARATOR . $rcube_include_path); +} + // Register autoloader spl_autoload_register('rcube_autoload'); |