summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-21 10:50:14 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-21 10:50:14 +0200
commitfe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c (patch)
tree63888971edf6b4857776f09017733bf7bb2caf3d
parentb2631bffd98a51fc8b61aa8452fbaf3e95bcde24 (diff)
Fix possible PHP warning, read default_folders using config->get()
to support deprecated option name (default_imap_folders)
-rw-r--r--program/steps/settings/folders.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 2691a6e26..1031fc136 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -44,8 +44,8 @@ if ($RCMAIL->action == 'subscribe')
if ($result) {
// Handle subscription of protected folder (#1487656)
- if ($CONFIG['protect_default_folders'] == true
- && in_array($mbox, $CONFIG['default_folders'])
+ if ($RCMAIL->config->get('protect_default_folders')
+ && in_array($mbox, (array)$RCMAIL->config->get('default_folders'))
) {
$OUTPUT->command('disable_subscription', $mbox);
}