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

Aleksander Machniak

2013-08-23 e9c5b9f09602d7ffc9ce80e887ee1918d8e5b3ce

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

Conflicts:

	CHANGELOG
	program/lib/Roundcube/bootstrap.php

 CHANGELOG

@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================

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

RELEASE 0.9.3
-------------
- Fix setting refresh_interval to "Never" in Preferences (#1489286)

 program/lib/Roundcube/bootstrap.php

@@ -84,11 +84,22 @@
    @mb_regex_encoding(RCUBE_CHARSET);
}

<<<<<<< HEAD
// make sure the 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);
=======
// make sure the Roundcube lib directory is in the 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);
>>>>>>> 9f75449... Fix unquoted path in PREG expression on Windows (#1489290)
}

// Register autoloader