X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiUndelete.php;h=469fe7f7e32b798f251fb2cc64eca71ab8b95915;hb=55035e01e591b7bba373267e3ea5f0c0dad9b949;hp=28702b1926ba4f881b6ea69676a30092dd52792d;hpb=536a06e64303f1cc8f44b197d8dc7423cda959a6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 28702b1926..3aa7b608dc 100644
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -30,32 +30,38 @@
 class ApiUndelete extends ApiBase {
 
 	public function execute() {
-		$params = $this->extractRequestParams();
+		$this->useTransactionalTimeLimit();
 
-		if ( !$this->getUser()->isAllowed( 'undelete' ) ) {
-			$this->dieUsageMsg( 'permdenied-undelete' );
-		}
+		$params = $this->extractRequestParams();
 
-		if ( $this->getUser()->isBlocked() ) {
-			$this->dieUsage(
-				'You have been blocked from editing',
-				'blocked',
-				0,
-				array( 'blockinfo' => ApiQueryUserInfo::getBlockInfo( $this->getUser()->getBlock() ) )
-			);
+		$user = $this->getUser();
+		if ( $user->isBlocked() ) {
+			$this->dieBlocked( $user->getBlock() );
 		}
 
 		$titleObj = Title::newFromText( $params['title'] );
 		if ( !$titleObj || $titleObj->isExternal() ) {
-			$this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
+			$this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['title'] ) ] );
+		}
+
+		if ( !$titleObj->userCan( 'undelete', $user, 'secure' ) ) {
+			$this->dieWithError( 'permdenied-undelete' );
+		}
+
+		// Check if user can add tags
+		if ( !is_null( $params['tags'] ) ) {
+			$ableToTag = ChangeTags::canAddTagsAccompanyingChange( $params['tags'], $user );
+			if ( !$ableToTag->isOK() ) {
+				$this->dieStatus( $ableToTag );
+			}
 		}
 
 		// Convert timestamps
 		if ( !isset( $params['timestamps'] ) ) {
-			$params['timestamps'] = array();
+			$params['timestamps'] = [];
 		}
 		if ( !is_array( $params['timestamps'] ) ) {
-			$params['timestamps'] = array( $params['timestamps'] );
+			$params['timestamps'] = [ $params['timestamps'] ];
 		}
 		foreach ( $params['timestamps'] as $i => $ts ) {
 			$params['timestamps'][$i] = wfTimestamp( TS_MW, $ts );
@@ -63,19 +69,20 @@ class ApiUndelete extends ApiBase {
 
 		$pa = new PageArchive( $titleObj, $this->getConfig() );
 		$retval = $pa->undelete(
-			( isset( $params['timestamps'] ) ? $params['timestamps'] : array() ),
+			( isset( $params['timestamps'] ) ? $params['timestamps'] : [] ),
 			$params['reason'],
 			$params['fileids'],
 			false,
-			$this->getUser()
+			$user,
+			$params['tags']
 		);
 		if ( !is_array( $retval ) ) {
-			$this->dieUsageMsg( 'cannotundelete' );
+			$this->dieWithError( 'apierror-cantundelete' );
 		}
 
 		if ( $retval[1] ) {
 			Hooks::run( 'FileUndeleteComplete',
-				array( $titleObj, $params['fileids'], $this->getUser(), $params['reason'] ) );
+				[ $titleObj, $params['fileids'], $this->getUser(), $params['reason'] ] );
 		}
 
 		$this->setWatch( $params['watchlist'], $titleObj );
@@ -96,30 +103,34 @@ class ApiUndelete extends ApiBase {
 	}
 
 	public function getAllowedParams() {
-		return array(
-			'title' => array(
+		return [
+			'title' => [
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_REQUIRED => true
-			),
+			],
 			'reason' => '',
-			'timestamps' => array(
+			'tags' => [
+				ApiBase::PARAM_TYPE => 'tags',
+				ApiBase::PARAM_ISMULTI => true,
+			],
+			'timestamps' => [
 				ApiBase::PARAM_TYPE => 'timestamp',
 				ApiBase::PARAM_ISMULTI => true,
-			),
-			'fileids' => array(
+			],
+			'fileids' => [
 				ApiBase::PARAM_TYPE => 'integer',
 				ApiBase::PARAM_ISMULTI => true,
-			),
-			'watchlist' => array(
+			],
+			'watchlist' => [
 				ApiBase::PARAM_DFLT => 'preferences',
-				ApiBase::PARAM_TYPE => array(
+				ApiBase::PARAM_TYPE => [
 					'watch',
 					'unwatch',
 					'preferences',
 					'nochange'
-				),
-			),
-		);
+				],
+			],
+		];
 	}
 
 	public function needsToken() {
@@ -127,16 +138,16 @@ class ApiUndelete extends ApiBase {
 	}
 
 	protected function getExamplesMessages() {
-		return array(
+		return [
 			'action=undelete&title=Main%20Page&token=123ABC&reason=Restoring%20main%20page'
 				=> 'apihelp-undelete-example-page',
 			'action=undelete&title=Main%20Page&token=123ABC' .
 				'&timestamps=2007-07-03T22:00:45Z|2007-07-02T19:48:56Z'
 				=> 'apihelp-undelete-example-revisions',
-		);
+		];
 	}
 
 	public function getHelpUrls() {
-		return 'https://www.mediawiki.org/wiki/API:Undelete';
+		return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Undelete';
 	}
 }