summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-06-26 09:05:47 +0200
committerAleksander Machniak <alec@alec.pl>2013-06-26 09:05:47 +0200
commit253f0aed1699c84cbdb684ef53e6c9c56c077d6f (patch)
tree6a7a5a4c472b5a663e394ec3607e9d30e87c76e9
parent3aa16c320b9b0f0a0b91d61400cd25ea769a99a5 (diff)
Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174)
-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);
}