From d15b8f962ca730046325699b8bea8203ea057a27 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 11 Feb 2011 10:27:07 +0000 Subject: [PATCH] Merge callback fixes from 1.17wmf1. /e is evil. --- languages/classes/LanguageEo.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php index 70c197c1a7..7ec447e703 100644 --- a/languages/classes/LanguageEo.php +++ b/languages/classes/LanguageEo.php @@ -41,12 +41,12 @@ class LanguageEo extends Language { if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) { return preg_replace_callback ( '/([cghjsu]x?)((?:xx)*)(?!x)/i', - 'strrtxuCallback', $string ); + array( $this, 'strrtxuCallback' ), $string ); } else if ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) { # Double Xs only if they follow cxapelutaj literoj. return preg_replace_callback( - '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/ei', - 'strrtuxCallback', $string ); + '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/i', + array( $this, 'strrtuxCallback' ), $string ); } return parent::iconv( $in, $out, $string ); } -- 2.20.1