summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-08-23 19:06:15 +0200
committerAleksander Machniak <alec@alec.pl>2013-08-23 19:07:11 +0200
commite9c5b9f09602d7ffc9ce80e887ee1918d8e5b3ce (patch)
treeb277394ebf8f9884e7de7094675e4e8ebb31dbfc /program
parenta6f5a68880aebe1311f38c15320d49b7d51d17d0 (diff)
Fix unquoted path in PREG expression on Windows (#1489290)
Conflicts: CHANGELOG program/lib/Roundcube/bootstrap.php
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/bootstrap.php11
1 files changed, 11 insertions, 0 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index bb93b53a4..1d82616a9 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -84,11 +84,22 @@ if (extension_loaded('mbstring')) {
@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