Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 8 insertions, 2 deletions

diff --git a/includes/api/ApiRsd.php b/includes/api/ApiRsd.php
index d219c91c..a2771a0c 100644
--- a/includes/api/ApiRsd.php
+++ b/includes/api/ApiRsd.php
@@ -60,7 +60,7 @@ class ApiRsd extends ApiBase {
 	}
 
 	public function getDescription() {
-		return 'Export an RSD (Really Simple Discovery) schema';
+		return 'Export an RSD (Really Simple Discovery) schema.';
 	}
 
 	public function getExamples() {
@@ -69,6 +69,10 @@ class ApiRsd extends ApiBase {
 		);
 	}
 
+	public function isReadMode() {
+		return false;
+	}
+
 	/**
 	 * Builds an internal list of APIs to expose information about.
 	 * Normally this only lists the MediaWiki API, with its base URL,
@@ -107,6 +111,7 @@ class ApiRsd extends ApiBase {
 			),
 		);
 		wfRunHooks( 'ApiRsdServiceApis', array( &$apis ) );
+
 		return $apis;
 	}
 
@@ -149,12 +154,13 @@ class ApiRsd extends ApiBase {
 			}
 			$outputData[] = $data;
 		}
+
 		return $outputData;
 	}
 }
 
 class ApiFormatXmlRsd extends ApiFormatXml {
-	public function __construct( $main, $format ) {
+	public function __construct( ApiMain $main, $format ) {
 		parent::__construct( $main, $format );
 		$this->setRootElement( 'rsd' );
 	}