Merge "tests: Remove unused TableCleanupTest class"

[lhc/web/wiklou.git] / includes / deferred / LinksUpdate.php

diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index dbfdab0..755a7cd 100644 (file)
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -61,9 +61,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
        /** @var bool Whether to queue jobs for recursive updates */
        public $mRecursive;
 
-       /** @var bool Whether this job was triggered by a recursive update job */
-       private $mTriggeredRecursive;
-
        /** @var Revision Revision for which this update has been triggered */
        private $mRevision;
 
@@ -145,12 +142,14 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
        public function doUpdate() {
                Hooks::run( 'LinksUpdate', array( &$this ) );
                $this->doIncrementalUpdate();
-               Hooks::run( 'LinksUpdateComplete', array( &$this ) );
+
+               $that = $this;
+               $this->mDb->onTransactionIdle( function() use ( $that ) {
+                       Hooks::run( 'LinksUpdateComplete', array( &$that ) );
+               } );
        }
 
        protected function doIncrementalUpdate() {
-               global $wgRCWatchCategoryMembership;
-
                # Page links
                $existing = $this->getExistingLinks();
                $this->linkDeletions = $this->getLinkDeletions( $existing );
@@ -202,14 +201,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
                $this->invalidateCategories( $categoryUpdates );
                $this->updateCategoryCounts( $categoryInserts, $categoryDeletes );
 
-               # Category membership changes
-               if (
-                       $wgRCWatchCategoryMembership &&
-                       !$this->mTriggeredRecursive && ( $categoryInserts || $categoryDeletes )
-               ) {
-                       $this->triggerCategoryChanges( $categoryInserts, $categoryDeletes );
-               }
-
                # Page properties
                $existing = $this->getExistingProperties();
 
@@ -233,24 +224,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
 
        }
 
-       private function triggerCategoryChanges( $categoryInserts, $categoryDeletes ) {
-               $catMembChange = new CategoryMembershipChange( $this->mTitle, $this->mRevision );
-
-               if ( $this->mRecursive ) {
-                       $catMembChange->checkTemplateLinks();
-               }
-
-               foreach ( $categoryInserts as $categoryName => $value ) {
-                       $categoryTitle = Title::newFromText( $categoryName, NS_CATEGORY );
-                       $catMembChange->triggerCategoryAddedNotification( $categoryTitle );
-               }
-
-               foreach ( $categoryDeletes as $categoryName => $value ) {
-                       $categoryTitle = Title::newFromText( $categoryName, NS_CATEGORY );
-                       $catMembChange->triggerCategoryRemovedNotification( $categoryTitle );
-               }
-       }
-
        /**
         * Queue recursive jobs for this page
         *
@@ -892,15 +865,6 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
                return $this->mImages;
        }
 
-       /**
-        * Set this object as being triggered by a recursive LinksUpdate
-        *
-        * @since 1.27
-        */
-       public function setTriggeredRecursive() {
-               $this->mTriggeredRecursive = true;
-       }
-
        /**
         * Set the revision corresponding to this LinksUpdate
         *
@@ -944,8 +908,7 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
                                        $inv = array( $inv );
                                }
                                foreach ( $inv as $table ) {
-                                       $update = new HTMLCacheUpdate( $this->mTitle, $table );
-                                       $update->doUpdate();
+                                       DeferredUpdates::addUpdate( new HTMLCacheUpdate( $this->mTitle, $table ) );
                                }
                        }
                }