summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-09-13 18:27:24 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-09-13 18:27:24 +0200
commita315bf2dda957a118c775594b4ea01f79dadcdbe (patch)
tree8784572d9742d773ceac6852c75e0be86f71e19e /program
parent64cf4df42b7f6c93f22ea2b927fcc1d2ca6a99f4 (diff)
Support both new and old config variables
Diffstat (limited to 'program')
-rw-r--r--program/lib/Roundcube/rcube_config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index ac3ea678c..a3741758f 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -214,7 +214,7 @@ class rcube_config
$success = true;
}
// deprecated name of config variable
- else if (is_array($rcmail_config)) {
+ if (is_array($rcmail_config)) {
$this->merge($rcmail_config);
$success = true;
}