Changeset 1469 in subversion

Timestamp:

Jun 4, 2008 5:13:06 AM (5 years ago)

Author:

thomasb

Message:

Chech for mb_convert_encoding first because mbstring is optional for RoundCube + add some phpdoc

Location:

trunk/roundcubemail/program

Files:

• lib/washtml.php (modified) (1 diff)
• steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/program/lib/washtml.php

@@ -188 +188 @@
     $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);

trunk/roundcubemail/program/steps/mail/func.inc

@@ -515 +515 @@
 
 /**
+ * Convert the given message part to proper HTML
+ * which can be displayed the message view
  *
- */
-function rcmail_print_body($part, $safe=FALSE, $plain=FALSE)
+ * @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)
 {
   global $REMOTE_OBJECTS;