Permalink
Browse files

Merge branch 'wip-mdl-22896-m21' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_21_STABLE
  • Loading branch information...
2 parents 40e2405 + 97c8fe4 commit 4c52d60ed4106837ac42c719ce300998c178a159 @nebgor nebgor committed Feb 28, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/html2text.php
View
@@ -470,7 +470,7 @@ function _convert()
$text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
// Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
- $text = preg_replace('/&[^&;]+;/i', '', $text);
+ $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);
// Strip any other HTML tags
$text = strip_tags($text, $this->allowed_tags);

0 comments on commit 4c52d60

Please sign in to comment.