Permalink
Browse files

MDL-2794: fix html2text handling of non-ASCII characters

  • Loading branch information...
1 parent c6cda62 commit e3b02662bd8bfc4f89b17f23985ac9dd4728e915 fmarier committed Jun 15, 2009
Showing with 6 additions and 5 deletions.
  1. +3 −1 lib/html2text.php
  2. +3 −4 lib/html2text_readme.txt
View
@@ -30,6 +30,7 @@
* *
*************************************************************************/
+require_once "$CFG->libdir/textlib.class.php";
/**
* Takes HTML and converts it to formatted, plain text.
@@ -471,7 +472,8 @@ function _convert()
$text = preg_replace_callback($this->callback_search, array(&$this, '_preg_callback'), $text);
// Replace known html entities
- $text = utf8_encode(html_entity_decode($text));
+ $tl=textlib_get_instance();
+ $text = $tl->entities_to_utf8($text, true);
// Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
$text = preg_replace('/&[^&;]+;/i', '', $text);
View
@@ -12,13 +12,12 @@ Modifications
by using this code:
- utf8_encode(html_entity_decode($string));
+ $tl=textlib_get_instance();
+ $text = $tl->entities_to_utf8($text, true);
instead of:
- html_entity_decode($string, ENT_COMPAT, 'UTF-8');
-
-(see http://nz.php.net/manual/en/function.html-entity-decode.php#89483)
+ $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
2- fixed error in preg_replace_callback on php4

0 comments on commit e3b0266

Please sign in to comment.