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, 3 insertions, 11 deletions

diff --git a/includes/api/ApiFormatYaml.php b/includes/api/ApiFormatYaml.php
index ccf52746..d62bbbba 100644
--- a/includes/api/ApiFormatYaml.php
+++ b/includes/api/ApiFormatYaml.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * API for MediaWiki 1.8+
+ *
  *
  * Created on Sep 19, 2006
  *
@@ -33,25 +33,17 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * API YAML output formatter
  * @ingroup API
  */
-class ApiFormatYaml extends ApiFormatBase {
-
-	public function __construct( $main, $format ) {
-		parent::__construct( $main, $format );
-	}
+class ApiFormatYaml extends ApiFormatJson {
 
 	public function getMimeType() {
 		return 'application/yaml';
 	}
 
-	public function execute() {
-		$this->printText( Spyc::YAMLDump( $this->getResultData() ) );
-	}
-
 	public function getDescription() {
 		return 'Output data in YAML format' . parent::getDescription();
 	}
 
 	public function getVersion() {
-		return __CLASS__ . ': $Id: ApiFormatYaml.php 70647 2010-08-07 19:59:42Z ialex $';
+		return __CLASS__ . ': $Id: ApiFormatYaml.php 86302 2011-04-18 11:42:44Z reedy $';
 	}
 }