docs/kss/package.json: Update Gerrit /r/p/ link to /r/

[lhc/web/wiklou.git] / includes / api / ApiTag.php

diff --git a/includes/api/ApiTag.php b/includes/api/ApiTag.php
index c9f6db3..aff0183 100644 (file)
--- a/includes/api/ApiTag.php
+++ b/includes/api/ApiTag.php
@@ -19,21 +19,31 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+use MediaWiki\Revision\RevisionStore;
+
 /**
  * @ingroup API
  * @since 1.25
  */
 class ApiTag extends ApiBase {
 
+       /** @var RevisionStore */
+       private $revisionStore;
+
        public function execute() {
+               $this->revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
+
                $params = $this->extractRequestParams();
                $user = $this->getUser();
 
                // make sure the user is allowed
                $this->checkUserRightsAny( 'changetags' );
 
-               if ( $user->isBlocked() ) {
-                       $this->dieBlocked( $user->getBlock() );
+               // @TODO Use PermissionManager::isBlockedFrom() instead.
+               $block = $user->getBlock();
+               if ( $block ) {
+                       $this->dieBlocked( $block );
                }
 
                // Check if user can add tags
@@ -84,7 +94,7 @@ class ApiTag extends ApiBase {
                                $valid = RecentChange::newFromId( $id );
                                break;
                        case 'revid':
-                               $valid = Revision::newFromId( $id );
+                               $valid = $this->revisionStore->getRevisionById( $id );
                                break;
                        case 'logid':
                                $valid = self::validateLogId( $id );