Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 2 insertions, 14 deletions

diff --git a/includes/api/ApiDisabled.php b/includes/api/ApiDisabled.php
index 6ea5d202..fc975220 100644
--- a/includes/api/ApiDisabled.php
+++ b/includes/api/ApiDisabled.php
@@ -44,19 +44,7 @@ class ApiDisabled extends ApiBase {
 		return false;
 	}
 
-	public function getAllowedParams() {
-		return array();
-	}
-
-	public function getParamDescription() {
-		return array();
-	}
-
-	public function getDescription() {
-		return 'This module has been disabled.';
-	}
-
-	public function getExamples() {
-		return array();
+	protected function getDescriptionMessage() {
+		return 'apihelp-disabled-description';
 	}
 }