Ticket #16908: 16909.patch

wp-includes/formatting.php

@@ -654 +654 @@
                 $string = strtr($string, $chars);
         } else {
                 // Assume ISO-8859-1 if not UTF-8
-                $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
-                        .chr(159).chr(162).chr(165).chr(181).chr(192).chr(193).chr(194)
-                        .chr(195).chr(196).chr(197).chr(199).chr(200).chr(201).chr(202)
-                        .chr(203).chr(204).chr(205).chr(206).chr(207).chr(209).chr(210)
-                        .chr(211).chr(212).chr(213).chr(214).chr(216).chr(217).chr(218)
-                        .chr(219).chr(220).chr(221).chr(224).chr(225).chr(226).chr(227)
-                        .chr(228).chr(229).chr(231).chr(232).chr(233).chr(234).chr(235)
-                        .chr(236).chr(237).chr(238).chr(239).chr(241).chr(242).chr(243)
-                        .chr(244).chr(245).chr(246).chr(248).chr(249).chr(250).chr(251)
-                        .chr(252).chr(253).chr(255);
+                $chars = array(
+                chr(128) => 'E', chr(131) => 'f',
+                chr(138) => 'S', chr(142) => 'Z',
+                chr(154) => 's', chr(158) => 'z',
+                chr(159) => 'Y', chr(162) => 'c',
+                chr(165) => 'Y', chr(181) => 'u',
+                chr(192) => 'A', chr(193) => 'A',
+                chr(194) => 'A', chr(195) => 'A',
+                chr(196) => 'A', chr(197) => 'A',
+                chr(199) => 'C', chr(200) => 'E',
+                chr(201) => 'E', chr(202) => 'E',
+                chr(203) => 'E', chr(204) => 'I',
+                chr(205) => 'I', chr(206) => 'I',
+                chr(207) => 'I', chr(209) => 'N',
+                chr(210) => 'O', chr(211) => 'O',
+                chr(212) => 'O', chr(213) => 'O',
+                chr(214) => 'O', chr(216) => 'O',
+                chr(217) => 'U', chr(218) => 'U',
+                chr(219) => 'U', chr(220) => 'U',
+                chr(221) => 'Y', chr(224) => 'a',
+                chr(225) => 'a', chr(226) => 'a',
+                chr(227) => 'a', chr(228) => 'a',
+                chr(229) => 'a', chr(231) => 'c',
+                chr(232) => 'e', chr(233) => 'e',
+                chr(234) => 'e', chr(235) => 'e',
+                chr(236) => 'i', chr(237) => 'i',
+                chr(238) => 'i', chr(239) => 'i',
+                chr(241) => 'n', chr(242) => 'o',
+                chr(243) => 'o', chr(244) => 'o',
+                chr(245) => 'o', chr(246) => 'o',
+                chr(248) => 'o', chr(249) => 'u',
+                chr(250) => 'u', chr(251) => 'u',
+                chr(252) => 'u', chr(253) => 'y',
+                chr(255) => 'y');
+                $string = strtr($string, $chars);
 
-                $chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
-
-                $string = strtr($string, $chars['in'], $chars['out']);
-                $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
-                $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
-                $string = str_replace($double_chars['in'], $double_chars['out'], $string);
+                $double_chars = array(
+                chr(140) => 'OE', chr(156) => 'oe',
+                chr(198) => 'AE', chr(208) => 'DH',
+                chr(222) => 'TH', chr(223) => 'ss',
+                chr(230) => 'ae', chr(240) => 'dh',
+                chr(254) => 'th');
+                $string = strtr($string, $double_chars);
         }
 
         return $string;