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

1 files changed, 1 insertions, 1 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];