diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-09-20 08:18:54 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-09-20 08:18:54 +0200 |
| commit | b334a01791689a16c8d6b10955df850b891ff40e (patch) | |
| tree | 34173fc260a63a18ec56b75825cdc0925c84f594 /program/lib/Roundcube/rcube_config.php | |
| parent | 1bfd8ac27aa09421e77b629806dc9f667aa32cb6 (diff) | |
| parent | c1ff572e176dc930c52063e53364daa315d34666 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube_config.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_config.php | 2 |
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; } |