diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-05-17 17:01:22 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2007-05-17 17:01:22 +0000 |
| commit | 8aff9536db7f4fdd3b4871e534d15e035067796a (patch) | |
| tree | b7e32b142ed10f267940da680a2a7fae7da1fb3c /roundcubemail/program | |
| parent | 0bc5b0fb497dd1ee40e07e97da38e48358671293 (diff) | |
Fixed conditional template tags; hide quota display if imap server does not support it
git-svn-id: https://svn.roundcube.net/trunk@564 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/include/rcmail_template.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcmail_template.inc b/roundcubemail/program/include/rcmail_template.inc index e2fa682e4..6e3fe52b8 100644 --- a/roundcubemail/program/include/rcmail_template.inc +++ b/roundcubemail/program/include/rcmail_template.inc @@ -339,7 +339,7 @@ class rcmail_template extends rcube_html_page $submatches = preg_split('/<roundcube:(elseif|else|endif)\s+([^>]+)>/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE); if ($condmet) - $result = $submatches[0] . preg_replace('/.*<roundcube:endif\s+[^>]+>/is', '', $submatches[3]); + $result = $submatches[0] . ($submatches[1] != 'endif' ? preg_replace('/.*<roundcube:endif\s+[^>]+>/Uis', '', $submatches[3], 1) : $submatches[3]); else $result = "<roundcube:$submatches[1] $submatches[2]>" . $submatches[3]; diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 7416fb5d4..1848d301a 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -63,7 +63,7 @@ if (strlen($_GET['_uid'])) // set current mailbox in client environment $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name()); -//$OUTPUT->set_pagetitle(rcube_charset_convert($IMAP->get_mailbox_name(), 'UTF-7', 'UTF-8')); +$OUTPUT->set_env('quota', $IMAP->get_capability('quota')); if ($CONFIG['trash_mbox']) $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']); |