summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-06-26 09:11:04 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-06-26 09:11:04 +0200
commitbdaa4b2cb615e642ff7a3644bdfbb096406d29ff (patch)
treee387bf2530f31593b732245bb509c3ff7a15c56b
parent9eaf681b6be9e94b9e737eb2eaaa7272229334b1 (diff)
parent253f0aed1699c84cbdb684ef53e6c9c56c077d6f (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
-rw-r--r--CHANGELOG1
-rw-r--r--installer/rcube_install.php6
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fec5370dc..5f736a792 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174)
- Fix empty messages list when register_globals is enabled (#1489157)
- Improved/unified attachment preview screen, added print button
- Fix lack of space between searchfiler and quicksearchbar in Larry skin (#1489158)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 473fd2612..637808e8a 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -217,10 +217,12 @@ class rcube_install
// save change
$this->config[$prop] = $value;
+ $dump = self::_dump_var($value, $prop);
+
// replace the matching line in config file
$out = preg_replace(
- '/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Uie',
- "'\\1 = ' . rcube_install::_dump_var(\$value, \$prop) . ';'",
+ '/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Ui',
+ "\\1 = $dump;",
$out);
}