From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 languages/classes/LanguageEo.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'languages/classes/LanguageEo.php')

diff --git a/languages/classes/LanguageEo.php b/languages/classes/LanguageEo.php
index 7ec447e7..af058a3e 100644
--- a/languages/classes/LanguageEo.php
+++ b/languages/classes/LanguageEo.php
@@ -42,7 +42,7 @@ class LanguageEo extends Language {
 			return preg_replace_callback (
 				'/([cghjsu]x?)((?:xx)*)(?!x)/i',
 				array( $this, 'strrtxuCallback' ), $string	);
-		} else if ( strcasecmp( $in, 'UTF-8' ) == 0 && strcasecmp( $out, 'x' ) == 0 ) {
+		} elseif ( 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*)/i',
@@ -51,6 +51,10 @@ class LanguageEo extends Language {
 		return parent::iconv( $in, $out, $string );
 	}
 
+	/**
+	 * @param $matches array
+	 * @return string
+	 */
 	function strrtuxCallback( $matches ) {
 		static $ux = array (
 			'x' => 'xx' , 'X' => 'Xx' ,
@@ -64,6 +68,10 @@ class LanguageEo extends Language {
 		return strtr( $matches[1], $ux );
 	}
 
+	/**
+	 * @param $matches array
+	 * @return string
+	 */
 	function strrtxuCallback( $matches ) {
 		static $xu = array (
 			'xx' => 'x' , 'xX' => 'x' ,
@@ -84,6 +92,10 @@ class LanguageEo extends Language {
 		return strtr( $matches[1], $xu ) . strtr( $matches[2], $xu );
 	}
 
+	/**
+	 * @param $s string
+	 * @return string
+	 */
 	function checkTitleEncoding( $s ) {
 		# Check for X-system backwards-compatibility URLs
 		$ishigh = preg_match( '/[\x80-\xff]/', $s );
-- 
cgit v1.2.3-54-g00ecf