Merge "Make CDN purge calls use DeferredUpdates"

diff --combined includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index 8cb1ca6,27b6fd7..ae35e30
--- 1/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
--- 2/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@@ -29,7 -29,7 +29,7 @@@
   *   - a) Recursive jobs to purge caches for backlink pages for a given title.
   *        These jobs have (recursive:true,table:<table>) set.
   *   - b) Jobs to purge caches for a set of titles (the job title is ignored).
 - *          These jobs have (pages:(<page ID>:(<namespace>,<title>),...) set.
 + *        These jobs have (pages:(<page ID>:(<namespace>,<title>),...) set.
   *
   * @ingroup JobQueue
   */
@@@ -40,23 -40,6 +40,23 @@@ class HTMLCacheUpdateJob extends Job 
                $this->removeDuplicates = ( !isset( $params['range'] ) && !isset( $params['pages'] ) );
        }
  
 +      /**
 +       * @param Title $title Title to purge backlink pages from
 +       * @param string $table Backlink table name
 +       * @return HTMLCacheUpdateJob
 +       */
 +      public static function newForBacklinks( Title $title, $table ) {
 +              return new self(
 +                      $title,
 +                      array(
 +                              'table' => $table,
 +                              'recursive' => true
 +                      ) + Job::newRootJobParams( // "overall" refresh links job info
 +                              "htmlCacheUpdate:{$table}:{$title->getPrefixedText()}"
 +                      )
 +              );
 +      }
 +
        function run() {
                global $wgUpdateRowsPerJob, $wgUpdateRowsPerQuery;
  
@@@ -94,7 -77,7 +94,7 @@@
         * @param array $pages Map of (page ID => (namespace, DB key)) entries
         */
        protected function invalidateTitles( array $pages ) {
-               global $wgUpdateRowsPerQuery, $wgUseFileCache, $wgUseSquid;
+               global $wgUpdateRowsPerQuery, $wgUseFileCache;
  
                // Get all page IDs in this query into an array
                $pageIds = array_keys( $pages );
@@@ -140,10 -123,8 +140,8 @@@
                ) );
  
                // Update squid
-               if ( $wgUseSquid ) {
-                       $u = SquidUpdate::newFromTitles( $titleArray );
-                       $u->doUpdate();
-               }
+               $u = SquidUpdate::newFromTitles( $titleArray );
+               $u->doUpdate();
  
                // Update file cache
                if ( $wgUseFileCache ) {