From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 8 Dec 2013 09:55:49 +0100 Subject: Update to MediaWiki 1.22.0 --- includes/Fallback.php | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'includes/Fallback.php') diff --git a/includes/Fallback.php b/includes/Fallback.php index 2e19a095..cdf6c88e 100644 --- a/includes/Fallback.php +++ b/includes/Fallback.php @@ -35,13 +35,13 @@ class Fallback { if ( substr( $to, -8 ) == '//IGNORE' ) { $to = substr( $to, 0, strlen( $to ) - 8 ); } - if( strcasecmp( $from, $to ) == 0 ) { + if ( strcasecmp( $from, $to ) == 0 ) { return $string; } - if( strcasecmp( $from, 'utf-8' ) == 0 ) { + if ( strcasecmp( $from, 'utf-8' ) == 0 ) { return utf8_decode( $string ); } - if( strcasecmp( $to, 'utf-8' ) == 0 ) { + if ( strcasecmp( $to, 'utf-8' ) == 0 ) { return utf8_encode( $string ); } return $string; @@ -64,12 +64,12 @@ class Fallback { * @return string */ public static function mb_substr( $str, $start, $count = 'end' ) { - if( $start != 0 ) { + if ( $start != 0 ) { $split = self::mb_substr_split_unicode( $str, intval( $start ) ); $str = substr( $str, $split ); } - if( $count !== 'end' ) { + if ( $count !== 'end' ) { $split = self::mb_substr_split_unicode( $str, intval( $count ) ); $str = substr( $str, 0, $split ); } @@ -83,14 +83,14 @@ class Fallback { * @return int */ public static function mb_substr_split_unicode( $str, $splitPos ) { - if( $splitPos == 0 ) { + if ( $splitPos == 0 ) { return 0; } $byteLen = strlen( $str ); - if( $splitPos > 0 ) { - if( $splitPos > 256 ) { + if ( $splitPos > 0 ) { + if ( $splitPos > 256 ) { // Optimize large string offsets by skipping ahead N bytes. // This will cut out most of our slow time on Latin-based text, // and 1/2 to 1/3 on East European and Asian scripts. @@ -104,7 +104,7 @@ class Fallback { $bytePos = 0; } - while( $charPos++ < $splitPos ) { + while ( $charPos++ < $splitPos ) { ++$bytePos; // Move past any tail bytes while ( $bytePos < $byteLen && $str[$bytePos] >= "\x80" && $str[$bytePos] < "\xc0" ) { @@ -115,7 +115,7 @@ class Fallback { $splitPosX = $splitPos + 1; $charPos = 0; // relative to end of string; we don't care about the actual char position here $bytePos = $byteLen; - while( $bytePos > 0 && $charPos-- >= $splitPosX ) { + while ( $bytePos > 0 && $charPos-- >= $splitPosX ) { --$bytePos; // Move past any tail bytes while ( $bytePos > 0 && $str[$bytePos] >= "\x80" && $str[$bytePos] < "\xc0" ) { @@ -138,12 +138,12 @@ class Fallback { $total = 0; // Count ASCII bytes - for( $i = 0; $i < 0x80; $i++ ) { + for ( $i = 0; $i < 0x80; $i++ ) { $total += $counts[$i]; } // Count multibyte sequence heads - for( $i = 0xc0; $i < 0xff; $i++ ) { + for ( $i = 0xc0; $i < 0xff; $i++ ) { $total += $counts[$i]; } return $total; @@ -163,7 +163,7 @@ class Fallback { $ar = array(); preg_match( '/' . $needle . '/u', $haystack, $ar, PREG_OFFSET_CAPTURE, $offset ); - if( isset( $ar[0][1] ) ) { + if ( isset( $ar[0][1] ) ) { return $ar[0][1]; } else { return false; @@ -184,7 +184,7 @@ class Fallback { $ar = array(); preg_match_all( '/' . $needle . '/u', $haystack, $ar, PREG_OFFSET_CAPTURE, $offset ); - if( isset( $ar[0] ) && count( $ar[0] ) > 0 && + if ( isset( $ar[0] ) && count( $ar[0] ) > 0 && isset( $ar[0][count( $ar[0] ) - 1][1] ) ) { return $ar[0][count( $ar[0] ) - 1][1]; } else { -- cgit v1.2.3-54-g00ecf