From a315bf2dda957a118c775594b4ea01f79dadcdbe Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 13 Sep 2013 18:27:24 +0200
Subject: Support both new and old config variables

---
 program/lib/Roundcube/rcube_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/lib/Roundcube/rcube_config.php')

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;
                 }
-- 
cgit v1.2.3