[mms] Horde_Mime::is8bit() no longer requires the charset parameter.

horde · Oct 10, 2014 · c9d8be1 · c9d8be1
1 parent 33df700
commit c9d8be1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/framework/Mime/doc/Horde/Mime/UPGRADING b/framework/Mime/doc/Horde/Mime/UPGRADING
@@ -34,6 +34,10 @@ Upgrading to 2.5
       This method is deprecated. Use Horde_Mime_Headers#generateMessageId()
       instead.
 
+    - is8bit()
+
+      The 2nd parameter ($charset) is no longer needed/used.
+
     - isChild()
 
       This method is deprecated. Use Horde_Mime_Id#isChild() instead.

diff --git a/framework/Mime/lib/Horde/Mime.php b/framework/Mime/lib/Horde/Mime.php
@@ -42,13 +42,20 @@ class Horde_Mime
      *
      * @param string $string   The string to check.
      * @param string $charset  The charset of the string. Defaults to
-     *                         US-ASCII.
+     *                         US-ASCII. (@deprecated)
      *
-     * @return boolean  True if string contains non US-ASCII characters.
+     * @return boolean  True if string contains non 7-bit characters.
      */
     public static function is8bit($string, $charset = null)
     {
-        return ($string != Horde_String::convertCharset($string, $charset, 'US-ASCII'));
+        $string = strval($string);
+        for ($i = 0, $len = strlen($string); $i < $len; ++$i) {
+            if (ord($string[$i]) > 127) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     /**

diff --git a/framework/Mime/package.xml b/framework/Mime/package.xml
@@ -28,6 +28,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Horde_Mime::is8bit() no longer requires the charset parameter.
 * [mms] Improved MIME encoding.
 * [mms] Deprecated Horde_Mime::quotedPrintableEncode() and move to Horde_Mime_QuotedPrintable.
 * [mms] Moved MIME ID manipulation/query methods out of Horde_Mime and into Horde_Mime_Id.
@@ -1459,6 +1460,7 @@
    <date>2014-09-30</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Horde_Mime::is8bit() no longer requires the charset parameter.
 * [mms] Improved MIME encoding.
 * [mms] Deprecated Horde_Mime::quotedPrintableEncode() and move to Horde_Mime_QuotedPrintable.
 * [mms] Moved MIME ID manipulation/query methods out of Horde_Mime and into Horde_Mime_Id.