diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-08-24 08:37:15 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-08-24 08:37:15 +0200 |
| commit | 06efad1ac89669240348cedc8a1b7ad71e7b0e7e (patch) | |
| tree | 116fbe4d9f12f6b80936a566ffb91b608ae568e7 /program/lib/Roundcube | |
| parent | e9c5b9f09602d7ffc9ce80e887ee1918d8e5b3ce (diff) | |
Fix last commit conflict
Diffstat (limited to 'program/lib/Roundcube')
| -rw-r--r-- | program/lib/Roundcube/bootstrap.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php index 1d82616a9..65f98e94e 100644 --- a/program/lib/Roundcube/bootstrap.php +++ b/program/lib/Roundcube/bootstrap.php @@ -84,13 +84,6 @@ 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; @@ -99,7 +92,6 @@ $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 |