Changeset 5861 in subversion

Timestamp:

Feb 8, 2012 4:06:59 AM (16 months ago)

Author:

alec

Message:

• Handle HTML entities properly when converting strong/b/th content to upper case

File:

• trunk/roundcubemail/program/lib/html2text.php (modified) (1 diff)

trunk/roundcubemail/program/lib/html2text.php

@@ -700 +700 @@
 
     /**
-     *  Strtoupper multibyte wrapper function
-     *
-     *  @param  string
-     *  @return string
+     *  Strtoupper multibyte wrapper function with HTML entities handling
+     *
+     *  @param string $str Text to convert
+     *  @return string Converted text
      */
     private function _strtoupper($str)
     {
+        $str = html_entity_decode($str, ENT_COMPAT, RCMAIL_CHARSET);
+
         if (function_exists('mb_strtoupper'))
-            return mb_strtoupper($str);
+            $str = mb_strtoupper($str);
         else
-            return strtoupper($str);
+            $str = strtoupper($str);
+
+        $str = htmlspecialchars($str, ENT_COMPAT, RCMAIL_CHARSET);
+
+        return $str;
     }
 }