From 65cc1c196f0aff83a6c9db7b6e3a36630b66392d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 04 Jun 2008 05:13:06 -0400
Subject: [PATCH] Chech for mb_convert_encoding first because mbstring is optional for RoundCube + add some phpdoc
---
program/steps/mail/func.inc | 8 +++++++-
program/lib/washtml.php | 3 ++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/program/lib/washtml.php b/program/lib/washtml.php
index f45fd45..ad5f930 100644
--- a/program/lib/washtml.php
+++ b/program/lib/washtml.php
@@ -187,7 +187,8 @@
//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);
}
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0a1e4d4..85b0431 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -514,9 +514,15 @@
/**
+ * Convert the given message part to proper HTML
+ * which can be displayed the message view
*
+ * @param object rcube_message_part Message part
+ * @param bool True if external objects (ie. images ) are allowed
+ * @param bool True if part should be converted to plaintext
+ * @return string Formatted HTML string
*/
-function rcmail_print_body($part, $safe=FALSE, $plain=FALSE)
+function rcmail_print_body($part, $safe=false, $plain=false)
{
global $REMOTE_OBJECTS;
--
Gitblit v1.9.1