Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 5 insertions, 19 deletions

diff --git a/includes/api/ApiUnblock.php b/includes/api/ApiUnblock.php
index 2854a825..1af83ba3 100644
--- a/includes/api/ApiUnblock.php
+++ b/includes/api/ApiUnblock.php
@@ -93,30 +93,16 @@ class ApiUnblock extends ApiBase {
 		);
 	}
 
-	public function getParamDescription() {
-		$p = $this->getModulePrefix();
-
-		return array(
-			'id' => "ID of the block you want to unblock (obtained through list=blocks). " .
-				"Cannot be used together with {$p}user",
-			'user' => "Username, IP address or IP range you want to unblock. " .
-				"Cannot be used together with {$p}id",
-			'reason' => 'Reason for unblock',
-		);
-	}
-
-	public function getDescription() {
-		return 'Unblock a user.';
-	}
-
 	public function needsToken() {
 		return 'csrf';
 	}
 
-	public function getExamples() {
+	protected function getExamplesMessages() {
 		return array(
-			'api.php?action=unblock&id=105',
-			'api.php?action=unblock&user=Bob&reason=Sorry%20Bob'
+			'action=unblock&id=105'
+				=> 'apihelp-unblock-example-id',
+			'action=unblock&user=Bob&reason=Sorry%20Bob'
+				=> 'apihelp-unblock-example-user',
 		);
 	}