Fix unquoted path in PREG expression on Windows (#1489290)

pull/106/head
Aleksander Machniak 11 years ago
parent 8880e37f8f
commit 9f754494e7

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Fix unquoted path in PREG expression on Windows (#1489290)
- Fix replacement variables in user-specific base_dn in some LDAP requests (#1489279)
- Fix image scaling issues when image has only one dimension smaller than the limit (#1489274)
- Fix issue where uploaded photo was lost when contact form did not validate (#1489274)

@ -84,10 +84,13 @@ if (extension_loaded('mbstring')) {
}
// 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);
$rcube_path = realpath(RCUBE_LIB_DIR . '..');
$sep = PATH_SEPARATOR;
$regexp = "!(^|$sep)" . preg_quote($rcube_path, '!') . "($sep|\$)!";
$path = ini_get('include_path');
if (!preg_match($regexp, $path)) {
set_include_path($path . PATH_SEPARATOR . $rcube_path);
}
// Register autoloader

Loading…
Cancel
Save