From 9f754494e74396469ff6ceb34ece25b088756ffa Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 23 Aug 2013 19:06:15 +0200 Subject: Fix unquoted path in PREG expression on Windows (#1489290) --- program/lib/Roundcube/bootstrap.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'program/lib/Roundcube/bootstrap.php') diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 3f4d2c387..5d5a22387 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -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 -- cgit v1.2.3