r85536 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r85535‎ | r85536 | r85537 >
Date:13:50, 6 April 2011
Author:demon
Status:reverted (Comments)
Tags:
Comment:
Merge from 1.17wmf1: r84259
Modified paths:
  • /trunk/phase3/languages/Language.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/Language.php
——@@ -1863,8 +1863,7 @@
18641864 return $s;
18651865 }
18661866
1867 - $isutf8 = preg_match( '/^([\x00-\x7f]|[\xc0-\xdf][\x80-\xbf]|' .
1868 - '[\xe0-\xef][\x80-\xbf]{2}|[\xf0-\xf7][\x80-\xbf]{3})+$/', $s );
 1867+ $isutf8 = ( $s == iconv("UTF-8","UTF-8//IGNORE", $s));
18691868 if ( $isutf8 ) {
18701869 return $s;
18711870 }
Property changes on: trunk/phase3/languages/Language.php
___________________________________________________________________
Added: svn:mergeinfo
18721871 Merged /branches/sqlite/languages/Language.php:r58211-58321
18731872 Merged /branches/new-installer/phase3/languages/Language.php:r43664-66004
18741873 Merged /branches/wmf/1.17wmf1/languages/Language.php:r84259
18751874 Merged /branches/REL1_15/phase3/languages/Language.php:r51646

Follow-up revisions

RevisionCommit summaryAuthorDate
r86162Revert r85536 pending a better fixreedy00:23, 16 April 2011
r86164Revert r85537 per fixme on r85536reedy00:25, 16 April 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r84259eliminate PCRE recursion from URL checkmidom19:16, 18 March 2011

Comments

#Comment by Nikerabbit (talk | contribs)   17:21, 6 April 2011

PHP Notice: iconv(): Detected an illegal character in input string in /www/w/languages/Language.php on line 1884

#Comment by Midom (talk | contribs)   17:37, 16 April 2011

heh, @ time!

#Comment by Nikerabbit (talk | contribs)   18:52, 16 April 2011

??

#Comment by Midom (talk | contribs)   00:37, 17 April 2011

need to put @ in front of iconv() call - that notice is very much expected and //IGNORE is already specified. sad to have such notices though :)

#Comment by Midom (talk | contribs)   21:52, 6 April 2011

hm, do note that mediawiki has an iconv() wrapper, that would break with this, the change in wmf-deployment was based on the fact that we don't use the wrapper

Status & tagging log