From bdaa4b2cb615e642ff7a3644bdfbb096406d29ff Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 26 Jun 2013 03:11:04 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
CHANGELOG | 1 +
installer/rcube_install.php | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index fec5370..5f736a7 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 473fd26..637808e 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -217,10 +217,12 @@
// 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);
}
--
Gitblit v1.9.1