summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-22 18:01:44 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-12-22 18:01:44 +0000
commit3b02a34519fbdfc14248dbcb36d09b7f08315243 (patch)
tree898704a844a32e3f0740d701fa9a3d0d1ac7a4f0
parente52cb2626d4e785682241203bd680f2fe476e258 (diff)
Allow (escaped) html tags in roundcube special tag attributes
git-svn-id: https://svn.roundcube.net/trunk@5647 208e9e7b-5314-0410-a742-e7e81cd9613c
-rwxr-xr-xroundcubemail/program/include/rcube_template.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index f65080373..95f92a587 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -661,7 +661,7 @@ class rcube_template extends rcube_html_page
*/
private function parse_xml($input)
{
- return preg_replace_callback('/<roundcube:([-_a-z]+)\s+([^>]+)>/Ui', array($this, 'xml_command'), $input);
+ return preg_replace_callback('/<roundcube:([-_a-z]+)\s+((?:[^>]|\\\\>)+)(?<!\\\\)>/Ui', array($this, 'xml_command'), $input);
}