Merge "resourceloader: Move mw.user skeleton from startup to base"

[lhc/web/wiklou.git] / includes / specialpage / QueryPage.php

diff --git a/includes/specialpage/QueryPage.php b/includes/specialpage/QueryPage.php
index 700672f..6cc6e4e 100644 (file)
--- a/includes/specialpage/QueryPage.php
+++ b/includes/specialpage/QueryPage.php
@@ -21,6 +21,7 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
@@ -312,7 +313,7 @@ abstract class QueryPage extends SpecialPage {
                                $num = $res->numRows();
                                # Fetch results
                                $vals = [];
-                               foreach ( $res as $row ) {
+                               foreach ( $res as $i => $row ) {
                                        if ( isset( $row->value ) ) {
                                                if ( $this->usesTimestamps() ) {
                                                        $value = wfTimestamp( TS_UNIX,
@@ -321,7 +322,7 @@ abstract class QueryPage extends SpecialPage {
                                                        $value = intval( $row->value ); // T16414
                                                }
                                        } else {
-                                               $value = 0;
+                                               $value = $i;
                                        }
 
                                        $vals[] = [
@@ -375,6 +376,23 @@ abstract class QueryPage extends SpecialPage {
                return wfGetDB( DB_REPLICA, [ $this->getName(), 'QueryPage::recache', 'vslow' ] );
        }
 
+       /**
+        * Remove a cached result.
+        * Useful for interactive backlogs where the user can fix problems in-place.
+        * @param LinkTarget $title The page to remove.
+        * @since 1.34
+        */
+       public function delete( LinkTarget $title ) {
+               if ( $this->isCached() ) {
+                       $dbw = wfGetDB( DB_MASTER );
+                       $dbw->delete( 'querycache', [
+                               'qc_type' => $this->getName(),
+                               'qc_namespace' => $title->getNamespace(),
+                               'qc_title' => $title->getDBkey(),
+                       ], __METHOD__ );
+               }
+       }
+
        /**
         * Run the query and return the result
         * @param int|bool $limit Numerical limit or false for no limit
@@ -660,7 +678,7 @@ abstract class QueryPage extends SpecialPage {
                # an OutputPage, and let them get on with it
                $this->outputResults( $out,
                        $this->getSkin(),
-                       $dbr, # Should use a ResultWrapper for this
+                       $dbr, # Should use IResultWrapper for this
                        $res,
                        min( $this->numRows, $this->limit ), # do not format the one extra row, if exist
                        $this->offset );
@@ -738,13 +756,13 @@ abstract class QueryPage extends SpecialPage {
        }
 
        /**
-        * Creates a new LinkBatch object, adds all pages from the passed ResultWrapper (MUST include
+        * Creates a new LinkBatch object, adds all pages from the passed result wrapper (MUST include
         * title and optional the namespace field) and executes the batch. This operation will pre-cache
         * LinkCache information like page existence and information for stub color and redirect hints.
         *
-        * @param IResultWrapper $res The ResultWrapper object to process. Needs to include the title
+        * @param IResultWrapper $res The result wrapper to process. Needs to include the title
         *  field and namespace field, if the $ns parameter isn't set.
-        * @param null $ns Use this namespace for the given titles in the ResultWrapper object,
+        * @param null $ns Use this namespace for the given titles in the result wrapper,
         *  instead of the namespace value of $res.
         */
        protected function executeLBFromResultWrapper( IResultWrapper $res, $ns = null ) {