r81955 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81954‎ | r81955 | r81956 >
Date:10:27, 11 February 2011
Author:demon
Status:ok
Tags:
Comment:
Merge callback fixes from 1.17wmf1. /e is evil.
Modified paths:
  • /trunk/phase3/languages/classes/LanguageEo.php (modified) (history)

Diff [purge]

Index: trunk/phase3/languages/classes/LanguageEo.php
@@ -41,12 +41,12 @@
4242 if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) {
4343 return preg_replace_callback (
4444 '/([cghjsu]x?)((?:xx)*)(?!x)/i',
45 - 'strrtxuCallback', $string );
 45+ array( $this, 'strrtxuCallback' ), $string );
4646 } else if ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) {
4747 # Double Xs only if they follow cxapelutaj literoj.
4848 return preg_replace_callback(
49 - '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/ei',
50 - 'strrtuxCallback', $string );
 49+ '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/i',
 50+ array( $this, 'strrtuxCallback' ), $string );
5151 }
5252 return parent::iconv( $in, $out, $string );
5353 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r85148MFT: r80495, r80610, r80765, r81177, r81490, r81692, r81707, r81729, r81765, ...demon20:11, 1 April 2011

Status & tagging log