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, 56 insertions, 9 deletions

diff --git a/includes/parser/CoreTagHooks.php b/includes/parser/CoreTagHooks.php
index 33f3c824..7d488c4b 100644
--- a/includes/parser/CoreTagHooks.php
+++ b/includes/parser/CoreTagHooks.php
@@ -10,19 +10,30 @@
  * @ingroup Parser
  */
 class CoreTagHooks {
+	/**
+	 * @param $parser Parser
+	 * @return void
+	 */
 	static function register( $parser ) {
-		global $wgRawHtml, $wgUseTeX;
+		global $wgRawHtml;
 		$parser->setHook( 'pre', array( __CLASS__, 'pre' ) );
 		$parser->setHook( 'nowiki', array( __CLASS__, 'nowiki' ) );
 		$parser->setHook( 'gallery', array( __CLASS__, 'gallery' ) );
 		if ( $wgRawHtml ) {
 			$parser->setHook( 'html', array( __CLASS__, 'html' ) );
 		}
-		if ( $wgUseTeX ) {
-			$parser->setHook( 'math', array( __CLASS__, 'math' ) );
-		}
 	}
 
+	/**
+	 * Core parser tag hook function for 'pre'.
+	 * Text is treated roughly as 'nowiki' wrapped in an HTML 'pre' tag;
+	 * valid HTML attributes are passed on.
+	 *
+	 * @param string $text
+	 * @param array $attribs
+	 * @param Parser $parser
+	 * @return string HTML
+	 */
 	static function pre( $text, $attribs, $parser ) {
 		// Backwards-compatibility hack
 		$content = StringUtils::delimiterReplace( '<nowiki>', '</nowiki>', '$1', $text, 'i' );
@@ -33,6 +44,20 @@ class CoreTagHooks {
 			'</pre>';
 	}
 
+	/**
+	 * Core parser tag hook function for 'html', used only when
+	 * $wgRawHtml is enabled.
+	 *
+	 * This is potentially unsafe and should be used only in very careful
+	 * circumstances, as the contents are emitted as raw HTML.
+	 *
+	 * Uses undocumented extended tag hook return values, introduced in r61913.
+	 *
+	 * @param $content string
+	 * @param $attributes array
+	 * @param $parser Parser
+	 * @return array
+	 */
 	static function html( $content, $attributes, $parser ) {
 		global $wgRawHtml;
 		if( $wgRawHtml ) {
@@ -42,16 +67,38 @@ class CoreTagHooks {
 		}
 	}
 
+	/**
+	 * Core parser tag hook function for 'nowiki'. Text within this section
+	 * gets interpreted as a string of text with HTML-compatible character
+	 * references, and wiki markup within it will not be expanded.
+	 *
+	 * Uses undocumented extended tag hook return values, introduced in r61913.
+	 *
+	 * @param $content string
+	 * @param $attributes array
+	 * @param $parser Parser
+	 * @return array
+	 */
 	static function nowiki( $content, $attributes, $parser ) {
 		$content = strtr( $content, array( '-{' => '-&#123;', '}-' => '&#125;-' ) );
 		return array( Xml::escapeTagsOnly( $content ), 'markerType' => 'nowiki' );
 	}
 
-	static function math( $content, $attributes, $parser ) {
-		global $wgContLang;
-		return $wgContLang->armourMath( MathRenderer::renderMath( $content, $attributes, $parser->getOptions() ) );
-	}
-
+	/**
+	 * Core parser tag hook function for 'gallery'.
+	 *
+	 * Renders a thumbnail list of the given images, with optional captions.
+	 * Full syntax documented on the wiki:
+	 *
+	 *   http://www.mediawiki.org/wiki/Help:Images#Gallery_syntax
+	 *
+	 * @todo break Parser::renderImageGallery out here too.
+	 *
+	 * @param string $content
+	 * @param array $attributes
+	 * @param Parser $parser
+	 * @return string HTML
+	 */
 	static function gallery( $content, $attributes, $parser ) {
 		return $parser->renderImageGallery( $content, $attributes );
 	}