Changeset 907

Timestamp:

02/22/04 00:31:25 (5 years ago)

Author:

michelvaldrighi

Message:

fixes to handle ISO-scrambled email subjects in wp-mail

Files:

• trunk/wp-includes/functions-formatting.php (modified) (1 diff)
• trunk/wp-mail.php (modified) (1 diff)

trunk/wp-includes/functions-formatting.php

@@ -376 +376 @@
-}
-
+
+// used by wp-mail to handle charsets in email subjects
+
+function wp_iso_descrambler($string) {
+  /* this may only work with iso-8859-1, I'm afraid */
+  if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+    return $string;
+  } else {
+    $subject = str_replace('_', ' ', $matches[2]);
+    $subject = preg_replace('#\=([0-9a-f]{2})#ei', "chr(hexdec(strtolower('$1')))", $subject);
+    return $subject;
+  }
+}
+
-?>

trunk/wp-mail.php

@@ -74 +74 @@
-                $subject = trim($line);
-                $subject = substr($subject, 9, strlen($subject)-9);
+                if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $subject)) {
+                  $subject = wp_iso_descrambler($subject);
+                }
-                if ($use_phoneemail) {
-                    $subject = explode($phoneemail_separator, $subject);