X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FMovePage.php;h=59baae78e284846f1edf7aa96c0cff9abca89c71;hb=b1f648042f08a33314861f4cd22758dc02068f46;hp=9f018930d305709f266130b062a9bc7aabd42383;hpb=89cd937798b52e75834a12a66d9a728fcce4f06f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MovePage.php b/includes/MovePage.php
index 9f018930d3..59baae78e2 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -25,7 +25,7 @@ use MediaWiki\Page\MovePageFactory;
 use MediaWiki\Permissions\PermissionManager;
 use MediaWiki\Revision\SlotRecord;
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\LoadBalancer;
+use Wikimedia\Rdbms\ILoadBalancer;
 
 /**
  * Handles the backend logic of moving a page from one title
@@ -51,7 +51,7 @@ class MovePage {
 	protected $options;
 
 	/**
-	 * @var LoadBalancer
+	 * @var ILoadBalancer
 	 */
 	protected $loadBalancer;
 
@@ -61,7 +61,7 @@ class MovePage {
 	protected $nsInfo;
 
 	/**
-	 * @var WatchedItemStore
+	 * @var WatchedItemStoreInterface
 	 */
 	protected $watchedItems;
 
@@ -81,18 +81,18 @@ class MovePage {
 	 * @param Title $oldTitle
 	 * @param Title $newTitle
 	 * @param ServiceOptions|null $options
-	 * @param LoadBalancer|null $loadBalancer
+	 * @param ILoadBalancer|null $loadBalancer
 	 * @param NamespaceInfo|null $nsInfo
-	 * @param WatchedItemStore|null $watchedItems
+	 * @param WatchedItemStoreInterface|null $watchedItems
 	 * @param PermissionManager|null $permMgr
 	 */
 	public function __construct(
 		Title $oldTitle,
 		Title $newTitle,
 		ServiceOptions $options = null,
-		LoadBalancer $loadBalancer = null,
+		ILoadBalancer $loadBalancer = null,
 		NamespaceInfo $nsInfo = null,
-		WatchedItemStore $watchedItems = null,
+		WatchedItemStoreInterface $watchedItems = null,
 		PermissionManager $permMgr = null,
 		RepoGroup $repoGroup = null
 	) {
@@ -446,7 +446,7 @@ class MovePage {
 				$status = Status::newFatal( 'movepage-max-pages', $wgMaximumMovedPages );
 				$perTitleStatus[$oldSubpage->getPrefixedText()] = $status;
 				$topStatus->merge( $status );
-				$topStatus->setOk( true );
+				$topStatus->setOK( true );
 				break;
 			}
 
@@ -473,13 +473,14 @@ class MovePage {
 
 			$mp = new MovePage( $oldSubpage, $newSubpage );
 			$method = $checkPermissions ? 'moveIfAllowed' : 'move';
+			/** @var Status $status */
 			$status = $mp->$method( $user, $reason, $createRedirect, $changeTags );
 			if ( $status->isOK() ) {
 				$status->setResult( true, $newSubpage->getPrefixedText() );
 			}
 			$perTitleStatus[$oldSubpage->getPrefixedText()] = $status;
 			$topStatus->merge( $status );
-			$topStatus->setOk( true );
+			$topStatus->setOK( true );
 		}
 
 		$topStatus->value = $perTitleStatus;
@@ -508,7 +509,7 @@ class MovePage {
 
 		Hooks::run( 'TitleMoveStarting', [ $this->oldTitle, $this->newTitle, $user ] );
 
-		$pageid = $this->oldTitle->getArticleID( Title::GAID_FOR_UPDATE );
+		$pageid = $this->oldTitle->getArticleID( Title::READ_LATEST );
 		$protected = $this->oldTitle->isProtected();
 
 		// Do the actual move; if this fails, it will throw an MWException(!)