Merge "Deprecate redundant SquidUpdate::newSimplePurge()"

diff --git a/includes/deferred/SquidUpdate.php b/includes/deferred/SquidUpdate.php
index 5f1552d..0e4161c 100644 (file)
--- a/includes/deferred/SquidUpdate.php
+++ b/includes/deferred/SquidUpdate.php
@@ -56,6 +56,7 @@ class SquidUpdate implements DeferrableUpdate {
        /**
         * @param Title $title
         * @return SquidUpdate
+        * @deprecated 1.27
         */
        public static function newSimplePurge( Title $title ) {
                $urlArr = $title->getSquidURLs();

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 3ec3e89..29038c7 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -1163,7 +1163,7 @@ class WikiPage implements Page, IDBAccessObject {
                        $title->invalidateCache();
                        if ( $wgUseSquid ) {
                                // Send purge now that page_touched update was committed above
-                               $update = SquidUpdate::newSimplePurge( $title );
+                               $update = new SquidUpdate( $title->getSquidURLs() );
                                $update->doUpdate();
                        }
                } );