From b6da0b76afb5697685c35b8584631294cfc7b12f Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 7 Dec 2011 10:41:15 +0000 Subject: - Remove deprecated global $IMAP variable usage (#1488148) --- program/steps/settings/func.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/steps/settings/func.inc') diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index b778afa13..65836a958 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -875,13 +875,13 @@ function rcmail_folder_options($mailbox) */ function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class_name=null) { - global $IMAP, $CONFIG, $OUTPUT; + global $RCMAIL, $CONFIG, $OUTPUT; - $delimiter = $IMAP->get_hierarchy_delimiter(); + $delimiter = $RCMAIL->imap->get_hierarchy_delimiter(); $name_utf8 = rcube_charset_convert($name, 'UTF7-IMAP'); $protected = ($CONFIG['protect_default_folders'] == true && in_array($name, $CONFIG['default_imap_folders'])); - $foldersplit = explode($delimiter, $IMAP->mod_mailbox($name)); + $foldersplit = explode($delimiter, $RCMAIL->imap->mod_mailbox($name)); $level = count($foldersplit) - 1; $display_name = str_repeat('    ', $level) . Q($protected ? rcmail_localize_foldername($name) : rcube_charset_convert($foldersplit[$level], 'UTF7-IMAP')); -- cgit v1.2.3