Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 25 insertions, 7 deletions

diff --git a/languages/classes/LanguageWa.php b/languages/classes/LanguageWa.php
index 0cb439d0..4a186638 100644
--- a/languages/classes/LanguageWa.php
+++ b/languages/classes/LanguageWa.php
@@ -11,6 +11,11 @@
 class LanguageWa extends Language {
 	/**
 	 * Use singular form for zero
+	 *
+	 * @param $count int
+	 * @param $forms array
+	 *
+	 * @return string
 	 */
 	function convertPlural( $count, $forms ) {
 		if ( !count( $forms ) ) { return ''; }
@@ -19,11 +24,17 @@ class LanguageWa extends Language {
 		return ( $count <= 1 ) ? $forms[0] : $forms[1];
 	}
 
-	## #
-	## # Dates in Walloon are "1î d' <monthname>" for 1st of the month,
-	## # "<day> di <monthname>" for months starting by a consoun, and
-	## # "<day> d' <monthname>" for months starting with a vowel
-	## #
+	/**
+	 * Dates in Walloon are "1î d' <monthname>" for 1st of the month,
+	 * "<day> di <monthname>" for months starting by a consoun, and
+	 * "<day> d' <monthname>" for months starting with a vowel
+	 *
+	 * @param $ts string
+	 * @param $adj bool
+	 * @param $format bool
+	 * @param $tc bool
+	 * @return string
+	 */
 	function date( $ts, $adj = false, $format = true, $tc = false ) {
 		$ts = wfTimestamp( TS_MW, $ts );
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
@@ -51,10 +62,10 @@ class LanguageWa extends Language {
 		if ( $n == 1 ) {
 		    $d = "1î d' " . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
-		} else if ( $n == 2 || $n == 3 || $n == 20 || $n == 22 || $n == 23 ) {
+		} elseif ( $n == 2 || $n == 3 || $n == 20 || $n == 22 || $n == 23 ) {
 		    $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
-		} else if ( $m == 4 || $m == 8 || $m == 10 ) {
+		} elseif ( $m == 4 || $m == 8 || $m == 10 ) {
 		    $d = ( 0 + $n ) . " d' " . $this->getMonthName( $m ) .
 			" " .  substr( $ts, 0, 4 );
 		} else {
@@ -64,6 +75,13 @@ class LanguageWa extends Language {
 		return $d;
 	}
 
+	/**
+	 * @param $ts string
+	 * @param $adj bool
+	 * @param $format bool
+	 * @param $tc bool
+	 * @return string
+	 */
 	function timeanddate( $ts, $adj = false, $format = true, $tc = false ) {
 		if ( $adj ) { $ts = $this->userAdjust( $ts, $tc ); }
 		$datePreference = $this->dateFormat( $format );