X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiComparePages.php;h=d6867eb52dffb88a6cd8359e5af63839d530d261;hp=23009123a5527de47180e543ec41ae1940d127a4;hb=ce079cf6ad79ca8d3360817f809b219d166f9153;hpb=200322ca9a983f0a13d8ad2c3d70e623bfd68d24

diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 23009123a5..d6867eb52d 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -34,8 +34,7 @@ class ApiComparePages extends ApiBase {
 		$revision = Revision::newFromId( $rev1 );
 
 		if ( !$revision ) {
-			$this->dieUsage( 'The diff cannot be retrieved, ' .
-				'one revision does not exist or you do not have permission to view it.', 'baddiff' );
+			$this->dieWithError( 'apierror-baddiff' );
 		}
 
 		$contentHandler = $revision->getContentHandler();
@@ -46,7 +45,7 @@ class ApiComparePages extends ApiBase {
 			true,
 			false );
 
-		$vals = array();
+		$vals = [];
 		if ( isset( $params['fromtitle'] ) ) {
 			$vals['fromtitle'] = $params['fromtitle'];
 		}
@@ -65,11 +64,7 @@ class ApiComparePages extends ApiBase {
 		$difftext = $de->getDiffBody();
 
 		if ( $difftext === false ) {
-			$this->dieUsage(
-				'The diff cannot be retrieved. Maybe one or both revisions do ' .
-					'not exist or you do not have permission to view them.',
-				'baddiff'
-			);
+			$this->dieWithError( 'apierror-baddiff' );
 		}
 
 		ApiResult::setContentValue( $vals, 'body', $difftext );
@@ -89,47 +84,44 @@ class ApiComparePages extends ApiBase {
 		} elseif ( $titleText ) {
 			$title = Title::newFromText( $titleText );
 			if ( !$title || $title->isExternal() ) {
-				$this->dieUsageMsg( array( 'invalidtitle', $titleText ) );
+				$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $titleText ) ] );
 			}
 
 			return $title->getLatestRevID();
 		} elseif ( $titleId ) {
 			$title = Title::newFromID( $titleId );
 			if ( !$title ) {
-				$this->dieUsageMsg( array( 'nosuchpageid', $titleId ) );
+				$this->dieWithError( [ 'apierror-nosuchpageid', $titleId ] );
 			}
 
 			return $title->getLatestRevID();
 		}
-		$this->dieUsage(
-			'A title, a page ID, or a revision number is needed for both the from and the to parameters',
-			'inputneeded'
-		);
+		$this->dieWithError( 'apierror-compare-inputneeded', 'inputneeded' );
 	}
 
 	public function getAllowedParams() {
-		return array(
+		return [
 			'fromtitle' => null,
-			'fromid' => array(
+			'fromid' => [
 				ApiBase::PARAM_TYPE => 'integer'
-			),
-			'fromrev' => array(
+			],
+			'fromrev' => [
 				ApiBase::PARAM_TYPE => 'integer'
-			),
+			],
 			'totitle' => null,
-			'toid' => array(
+			'toid' => [
 				ApiBase::PARAM_TYPE => 'integer'
-			),
-			'torev' => array(
+			],
+			'torev' => [
 				ApiBase::PARAM_TYPE => 'integer'
-			),
-		);
+			],
+		];
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=compare&fromrev=1&torev=2'
 				=> 'apihelp-compare-example-1',
-		);
+		];
 	}
 }