summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-18 20:23:39 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-18 20:23:39 +0000
commitfda72711f50953ca7d922f884c9279ddf988d6b9 (patch)
treecadd985dd6a0300eba187a9c802124bed688759a
parent85b82e1e26a03b106ec14a230dcdae768a6f2220 (diff)
Better detection of HTML double-encoded entities
git-svn-id: https://svn.roundcube.net/trunk@1835 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/main.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index c279f3012..908ca3adc 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -347,7 +347,7 @@ function rep_specialchars_output($str, $enctype='', $mode='', $newlines=TRUE)
$str = strip_tags($str);
// avoid douple quotation of &
- $out = preg_replace('/&amp;([a-z]{2,5}|#[0-9]{2,4});/', '&\\1;', strtr($str, $encode_arr));
+ $out = preg_replace('/&amp;([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', strtr($str, $encode_arr));
return $newlines ? nl2br($out) : $out;
}