Merge "Remove Title->getSquidURLs, deprecated in 1.27, unused"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index b21a65a..4bd50c6 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -193,6 +193,8 @@ because of Phabricator reports.
   deprecated in 1.31, was removed.
 * Revision::fetchRevision(), deprecated in 1.28, was removed.
 * Class SquidUpdate, deprecated in 1.27, was removed.
+* Title->getSquidURLs(), deprecated in 1.27, was removed. Instead, use
+  Title->getCdnUrls().
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/Title.php b/includes/Title.php
index 0ee57c8..c2d04c3 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4020,13 +4020,6 @@ class Title implements LinkTarget, IDBAccessObject {
                return $urls;
        }
 
-       /**
-        * @deprecated since 1.27 use getCdnUrls()
-        */
-       public function getSquidURLs() {
-               return $this->getCdnUrls();
-       }
-
        /**
         * Purge all applicable CDN URLs
         */