Merge "RedirectSpecialArticle: Fix PHP notice about undefined index"

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

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 59ec4f6..846a8b1 100644 (file)
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -21,7 +21,7 @@
  */
 
 use Wikimedia\Rdbms\IDatabase;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 /**
  * This is a base class for all Query modules.
@@ -78,7 +78,7 @@ abstract class ApiQueryBase extends ApiBase {
        public function requestExtraData( $pageSet ) {
        }
 
-       /**@}*/
+       /** @} */
 
        /************************************************************************//**
         * @name   Data access
@@ -131,7 +131,7 @@ abstract class ApiQueryBase extends ApiBase {
                return $this->getQuery()->getPageSet();
        }
 
-       /**@}*/
+       /** @} */
 
        /************************************************************************//**
         * @name   Querying
@@ -368,7 +368,7 @@ abstract class ApiQueryBase extends ApiBase {
         * @param array|null &$hookData If set, the ApiQueryBaseBeforeQuery and
         *  ApiQueryBaseAfterQuery hooks will be called, and the
         *  ApiQueryBaseProcessRow hook will be expected.
-        * @return ResultWrapper
+        * @return IResultWrapper
         */
        protected function select( $method, $extraQuery = [], array &$hookData = null ) {
                $tables = array_merge(
@@ -460,12 +460,12 @@ abstract class ApiQueryBase extends ApiBase {
                $this->addJoinConds( $joinConds );
 
                // Don't show hidden names
-               if ( !$this->getUser()->isAllowed( 'hideuser' ) ) {
+               if ( !$this->getPermissionManager()->userHasRight( $this->getUser(), 'hideuser' ) ) {
                        $this->addWhere( 'ipb_deleted = 0 OR ipb_deleted IS NULL' );
                }
        }
 
-       /**@}*/
+       /** @} */
 
        /************************************************************************//**
         * @name   Utility methods
@@ -608,5 +608,5 @@ abstract class ApiQueryBase extends ApiBase {
                );
        }
 
-       /**@}*/
+       /** @} */
 }