diff options
author | thomascube <thomas@roundcube.net> | 2008-06-04 09:13:06 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2008-06-04 09:13:06 +0000 |
commit | 65cc1c196f0aff83a6c9db7b6e3a36630b66392d (patch) | |
tree | b113cb831e9c0b9f091873e0c142b7f724fba7a7 /program/lib | |
parent | 5d6ec21f9fb4011e8a6c78ca77631b5879469228 (diff) |
Chech for mb_convert_encoding first because mbstring is optional for RoundCube + add some phpdoc
Diffstat (limited to 'program/lib')
-rw-r--r-- | program/lib/washtml.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/program/lib/washtml.php b/program/lib/washtml.php index f45fd458a..ad5f930dc 100644 --- a/program/lib/washtml.php +++ b/program/lib/washtml.php @@ -187,7 +187,8 @@ class washtml //Charset seems to be ignored (probably if defined in the HTML document) $node = new DOMDocument('1.0', $config['charset']); $full = true; - $html = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'); + if (function_exists('mb_convert_encoding')) + $html = mb_convert_encoding($html, 'HTML-ENTITIES', $config['charset']); @$node->loadHTML($html); return self::dumpHtml($node, $config, $full); } |