Merge branch 'archwiki'

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

1 files changed, 3 insertions, 36 deletions

diff --git a/includes/api/ApiPatrol.php b/includes/api/ApiPatrol.php
index bd2fde2b..8b66781a 100644
--- a/includes/api/ApiPatrol.php
+++ b/includes/api/ApiPatrol.php
@@ -77,10 +77,6 @@ class ApiPatrol extends ApiBase {
 
 	public function getAllowedParams() {
 		return array(
-			'token' => array(
-				ApiBase::PARAM_TYPE => 'string',
-				ApiBase::PARAM_REQUIRED => true
-			),
 			'rcid' => array(
 				ApiBase::PARAM_TYPE => 'integer'
 			),
@@ -92,52 +88,23 @@ class ApiPatrol extends ApiBase {
 
 	public function getParamDescription() {
 		return array(
-			'token' => 'Patrol token obtained from list=recentchanges',
 			'rcid' => 'Recentchanges ID to patrol',
 			'revid' => 'Revision ID to patrol',
 		);
 	}
 
-	public function getResultProperties() {
-		return array(
-			'' => array(
-				'rcid' => 'integer',
-				'ns' => 'namespace',
-				'title' => 'string'
-			)
-		);
-	}
-
 	public function getDescription() {
-		return 'Patrol a page or revision';
-	}
-
-	public function getPossibleErrors() {
-		return array_merge(
-			parent::getPossibleErrors(),
-			parent::getRequireOnlyOneParameterErrorMessages( array( 'rcid', 'revid' ) ),
-			array(
-				array( 'nosuchrcid', 'rcid' ),
-				array( 'nosuchrevid', 'revid' ),
-				array(
-					'code' => 'notpatrollable',
-					'info' => "The revision can't be patrolled as it's too old"
-				)
-		) );
+		return 'Patrol a page or revision.';
 	}
 
 	public function needsToken() {
-		return true;
-	}
-
-	public function getTokenSalt() {
 		return 'patrol';
 	}
 
 	public function getExamples() {
 		return array(
-			'api.php?action=patrol&token=123abc&rcid=230672766',
-			'api.php?action=patrol&token=123abc&revid=230672766'
+			'api.php?action=patrol&token=123ABC&rcid=230672766',
+			'api.php?action=patrol&token=123ABC&revid=230672766'
 		);
 	}