Merge "Hard deprecate Password::equals()"

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

diff --git a/includes/deferred/CdnCacheUpdate.php b/includes/deferred/CdnCacheUpdate.php
index 301c4f3..2d07f75 100644 (file)
--- a/includes/deferred/CdnCacheUpdate.php
+++ b/includes/deferred/CdnCacheUpdate.php
@@ -62,15 +62,6 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
                return new CdnCacheUpdate( $urlArr );
        }
 
-       /**
-        * @param Title $title
-        * @return CdnCacheUpdate
-        * @deprecated since 1.27
-        */
-       public static function newSimplePurge( Title $title ) {
-               return new CdnCacheUpdate( $title->getCdnUrls() );
-       }
-
        /**
         * Purges the list of URLs passed to the constructor.
         */
@@ -80,13 +71,10 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
                self::purge( $this->urls );
 
                if ( $wgCdnReboundPurgeDelay > 0 ) {
-                       JobQueueGroup::singleton()->lazyPush( new CdnPurgeJob(
-                               Title::makeTitle( NS_SPECIAL, 'Badtitle/' . __CLASS__ ),
-                               [
-                                       'urls' => $this->urls,
-                                       'jobReleaseTimestamp' => time() + $wgCdnReboundPurgeDelay
-                               ]
-                       ) );
+                       JobQueueGroup::singleton()->lazyPush( new CdnPurgeJob( [
+                               'urls' => $this->urls,
+                               'jobReleaseTimestamp' => time() + $wgCdnReboundPurgeDelay
+                       ] ) );
                }
        }
 
@@ -286,10 +274,3 @@ class CdnCacheUpdate implements DeferrableUpdate, MergeableUpdate {
                return false;
        }
 }
-
-/**
- * @deprecated since 1.27
- */
-class SquidUpdate extends CdnCacheUpdate {
-       // Keep class name for b/c
-}