| Index: branches/REL1_17/phase3/languages/Language.php |
| — | — | @@ -1790,8 +1790,7 @@ |
| 1791 | 1791 | return $s; |
| 1792 | 1792 | } |
| 1793 | 1793 | |
| 1794 | | - $isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' . |
| 1795 | | - '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s ); |
| | 1794 | + $isutf8 = ( $s == iconv("UTF-8","UTF-8//IGNORE", $s)); |
| 1796 | 1795 | if ( $isutf8 ) { |
| 1797 | 1796 | return $s; |
| 1798 | 1797 | } |
| Property changes on: branches/REL1_17/phase3/languages/Language.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1799 | 1798 | Merged /branches/wmf/1.17wmf1/languages/Language.php:r84259 |