Switch /e preg_replace for callbacks

Swap "and" for &&

diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php
index d879235..8df9965 100644 (file)
--- a/languages/classes/LanguageEo.php
+++ b/languages/classes/LanguageEo.php
@@ -8,42 +8,52 @@ class LanguageEo extends Language {
        function iconv( $in, $out, $string ) {
                # Por multaj lingvoj, ĉi tiu nur voku la sisteman funkcion iconv()
                # Ni ankaŭ konvertu X-sistemajn surogotajn
-               if ( strcasecmp( $in, 'x' ) == 0 and strcasecmp( $out, 'utf-8' ) == 0 ) {
-                       $xu = array (
-                               'xx' => 'x' , 'xX' => 'x' ,
-                               'Xx' => 'X' , 'XX' => 'X' ,
-                               "Cx" => "\xc4\x88" , "CX" => "\xc4\x88" ,
-                               "cx" => "\xc4\x89" , "cX" => "\xc4\x89" ,
-                               "Gx" => "\xc4\x9c" , "GX" => "\xc4\x9c" ,
-                               "gx" => "\xc4\x9d" , "gX" => "\xc4\x9d" ,
-                               "Hx" => "\xc4\xa4" , "HX" => "\xc4\xa4" ,
-                               "hx" => "\xc4\xa5" , "hX" => "\xc4\xa5" ,
-                               "Jx" => "\xc4\xb4" , "JX" => "\xc4\xb4" ,
-                               "jx" => "\xc4\xb5" , "jX" => "\xc4\xb5" ,
-                               "Sx" => "\xc5\x9c" , "SX" => "\xc5\x9c" ,
-                               "sx" => "\xc5\x9d" , "sX" => "\xc5\x9d" ,
-                               "Ux" => "\xc5\xac" , "UX" => "\xc5\xac" ,
-                               "ux" => "\xc5\xad" , "uX" => "\xc5\xad"
-                               ) ;
-                       return preg_replace ( '/([cghjsu]x?)((?:xx)*)(?!x)/ei',
-                         'strtr( "$1", $xu ) . strtr( "$2", $xu )', $string );
-               } else if ( strcasecmp( $in, 'UTF-8' ) == 0 and strcasecmp( $out, 'x' ) == 0 ) {
-                       $ux = array (
-                               'x' => 'xx' , 'X' => 'Xx' ,
-                               "\xc4\x88" => "Cx" , "\xc4\x89" => "cx" ,
-                               "\xc4\x9c" => "Gx" , "\xc4\x9d" => "gx" ,
-                               "\xc4\xa4" => "Hx" , "\xc4\xa5" => "hx" ,
-                               "\xc4\xb4" => "Jx" , "\xc4\xb5" => "jx" ,
-                               "\xc5\x9c" => "Sx" , "\xc5\x9d" => "sx" ,
-                               "\xc5\xac" => "Ux" , "\xc5\xad" => "ux"
-                       ) ;
+               if ( strcasecmp( $in, 'x' ) == 0 && strcasecmp( $out, 'utf-8' ) == 0 ) {
+                       return preg_replace_callback (
+                               '/([cghjsu]x?)((?:xx)*)(?!x)/i',
+                               'strrtxuCallback', $string      );
+               } else if ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) {
                        # Double Xs only if they follow cxapelutaj literoj.
-                       return preg_replace( '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]' .
-                         '|\xc5[\x9c\x9d\xac\xad])x*)/ei', 'strtr( "$1", $ux )', $string );
+                       return preg_replace_callback(
+                               '/((?:[cghjsu]|\xc4[\x88\x89\x9c\x9d\xa4\xa5\xb4\xb5]|\xc5[\x9c\x9d\xac\xad])x*)/ei',
+                               'strrtuxCallback', $string );
                }
                return parent::iconv( $in, $out, $string );
        }
 
+       function strrtuxCallback( $matches ) {
+               static $ux = array (
+                       'x' => 'xx' , 'X' => 'Xx' ,
+                       "\xc4\x88" => "Cx" , "\xc4\x89" => "cx" ,
+                       "\xc4\x9c" => "Gx" , "\xc4\x9d" => "gx" ,
+                       "\xc4\xa4" => "Hx" , "\xc4\xa5" => "hx" ,
+                       "\xc4\xb4" => "Jx" , "\xc4\xb5" => "jx" ,
+                       "\xc5\x9c" => "Sx" , "\xc5\x9d" => "sx" ,
+                       "\xc5\xac" => "Ux" , "\xc5\xad" => "ux"
+               );
+               return strtr( $matches[1], $ux );
+       }
+
+       function strrtxuCallback( $matches ) {
+               static $xu = array (
+                       'xx' => 'x' , 'xX' => 'x' ,
+                       'Xx' => 'X' , 'XX' => 'X' ,
+                       "Cx" => "\xc4\x88" , "CX" => "\xc4\x88" ,
+                       "cx" => "\xc4\x89" , "cX" => "\xc4\x89" ,
+                       "Gx" => "\xc4\x9c" , "GX" => "\xc4\x9c" ,
+                       "gx" => "\xc4\x9d" , "gX" => "\xc4\x9d" ,
+                       "Hx" => "\xc4\xa4" , "HX" => "\xc4\xa4" ,
+                       "hx" => "\xc4\xa5" , "hX" => "\xc4\xa5" ,
+                       "Jx" => "\xc4\xb4" , "JX" => "\xc4\xb4" ,
+                       "jx" => "\xc4\xb5" , "jX" => "\xc4\xb5" ,
+                       "Sx" => "\xc5\x9c" , "SX" => "\xc5\x9c" ,
+                       "sx" => "\xc5\x9d" , "sX" => "\xc5\x9d" ,
+                       "Ux" => "\xc5\xac" , "UX" => "\xc5\xac" ,
+                       "ux" => "\xc5\xad" , "uX" => "\xc5\xad"
+               );
+               return strtr( $matches[1], $xu ) . strtr( $matches[2], $xu );
+       }
+
        function checkTitleEncoding( $s ) {
                # Check for X-system backwards-compatibility URLs
                $ishigh = preg_match( '/[\x80-\xff]/', $s );