X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiMove.php;h=cc4490e63fdcca319788cf371ee2bac20f7bd7a8;hb=1e4bf35253a6f672c57c1430c895049591fb090b;hp=281456434ad5e9b1c67cee97a7754ae13bb17ca2;hpb=43d159d469e9cbe4050266c1f05a84559bd24dc1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 281456434a..cc4490e63f 100644
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -86,6 +86,7 @@ class ApiMove extends ApiBase {
 		$status = $this->movePage( $fromTitle, $toTitle, $params['reason'], !$params['noredirect'],
 			$params['tags'] ?: [] );
 		if ( !$status->isOK() ) {
+			$user->spreadAnyEditBlock();
 			$this->dieStatus( $status );
 		}
 
@@ -99,7 +100,6 @@ class ApiMove extends ApiBase {
 		// a redirect to the new title. This is not safe, but what we did before was
 		// even worse: we just determined whether a redirect should have been created,
 		// and reported that it was created if it should have, without any checks.
-		// Also note that isRedirect() is unreliable because of T39209.
 		$r['redirectcreated'] = $fromTitle->exists();
 
 		$r['moveoverredirect'] = $toTitleExists;
@@ -152,10 +152,6 @@ class ApiMove extends ApiBase {
 		$watch = 'preferences';
 		if ( isset( $params['watchlist'] ) ) {
 			$watch = $params['watchlist'];
-		} elseif ( $params['watch'] ) {
-			$watch = 'watch';
-		} elseif ( $params['unwatch'] ) {
-			$watch = 'unwatch';
 		}
 
 		// Watch pages
@@ -250,14 +246,6 @@ class ApiMove extends ApiBase {
 			'movetalk' => false,
 			'movesubpages' => false,
 			'noredirect' => false,
-			'watch' => [
-				ApiBase::PARAM_DFLT => false,
-				ApiBase::PARAM_DEPRECATED => true,
-			],
-			'unwatch' => [
-				ApiBase::PARAM_DFLT => false,
-				ApiBase::PARAM_DEPRECATED => true,
-			],
 			'watchlist' => [
 				ApiBase::PARAM_DFLT => 'preferences',
 				ApiBase::PARAM_TYPE => [