Let the framework adjust the include_path if necessary

Thomas Bruederli

2013-08-16 d25ad5cc877738a3c352f22fdbd7eb205703e1e3

Let the framework adjust the include_path if necessary

 program/lib/Roundcube/bootstrap.php

@@ -58,7 +58,7 @@
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 @@
    @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');