r81760 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81759‎ | r81760 | r81761 >
Date:16:38, 8 February 2011
Author:demon
Status:ok (Comments)
Tags:
Comment:
preg_replace_callback() expects an actual callback
Modified paths:
  • /branches/wmf/1.17wmf1/languages/classes/LanguageEo.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/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, 'strrtuxCallback' ), $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(
4949 '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/ei',
50 - 'strrtuxCallback', $string );
 50+ array( $this, 'strrtuxCallback' ), $string );
5151 }
5252 return parent::iconv( $in, $out, $string );
5353 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r81954Remove /e from preg_replace. Never ever use it. It throws warnings on preg_re...demon10:24, 11 February 2011
r85009Merge changes from 1.17wmf1 during deployment period: r81760, r81761, r81954,...demon14:19, 30 March 2011

Comments

#Comment by 😂 (talk | contribs)   17:27, 14 February 2011

This doesn't need to be merged to 1.17 anymore, just grab r81955 instead.

#Comment by Catrope (talk | contribs)   18:39, 14 February 2011

Still needs merging, otherwise merging r81955 will conflict.

Status & tagging log