| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1859,7 +1859,8 @@ |
| 1860 | 1860 | return $s; |
| 1861 | 1861 | } |
| 1862 | 1862 | |
| 1863 | | - $isutf8 = ( $s == iconv("UTF-8","UTF-8//IGNORE", $s)); |
| | 1863 | + $isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . |
| | 1864 | + '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ); |
| 1864 | 1865 | if ( $isutf8 ) { |
| 1865 | 1866 | return $s; |
| 1866 | 1867 | } |
| Property changes on: trunk/phase3/languages/Language.php |
| ___________________________________________________________________ |
| Deleted: svn:mergeinfo |
| 1867 | 1868 | Reverse-merged /branches/sqlite/languages/Language.php:r58211-58321 |
| 1868 | 1869 | Reverse-merged /branches/new-installer/phase3/languages/Language.php:r43664-66004 |
| 1869 | 1870 | Reverse-merged /branches/wmf/1.17wmf1/languages/Language.php:r84259 |
| 1870 | 1871 | Reverse-merged /branches/REL1_15/phase3/languages/Language.php:r51646 |