From e9c5b9f09602d7ffc9ce80e887ee1918d8e5b3ce Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 23 Aug 2013 13:07:11 -0400
Subject: [PATCH] Fix unquoted path in PREG expression on Windows (#1489290)
---
program/lib/Roundcube/bootstrap.php | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index bb93b53..1d82616 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/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
--
Gitblit v1.9.1