From 7198044efba3df34642570d57cc567b51af0d5dd Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 17 May 2007 17:01:22 +0000
Subject: Fixed conditional template tags; hide quota display if imap server
 does not support it

---
 program/include/rcmail_template.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'program/include/rcmail_template.inc')

diff --git a/program/include/rcmail_template.inc b/program/include/rcmail_template.inc
index e2fa682e4..6e3fe52b8 100644
--- a/program/include/rcmail_template.inc
+++ b/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];
 
-- 
cgit v1.2.3