Merge "Drop SpecialPageFactory::getList(), deprecated in 1.24"

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 6324244..06514bc 100644 (file)
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -294,6 +294,8 @@ changes to languages because of Phabricator reports.
   * StripState::merge()
 * The "free" CSS class is now only applied to unbracketed URLs in wikitext. Links
   written using square brackets will get the class "text" not "free".
+* SpecialPageFactory::getList(), deprecated in 1.24, has been removed. You can
+  use ::getNames() instead.
 * OpenSearch::getOpenSearchTemplate(), deprecated in 1.25, has been removed. You
   can use ApiOpenSearch::getOpenSearchTemplate() instead.
 * The global function wfBaseConvert, deprecated in 1.27, has been removed. Use

diff --git a/includes/specialpage/SpecialPageFactory.php b/includes/specialpage/SpecialPageFactory.php
index 9469e69..fdf4d52 100644 (file)
--- a/includes/specialpage/SpecialPageFactory.php
+++ b/includes/specialpage/SpecialPageFactory.php
@@ -212,17 +212,6 @@ class SpecialPageFactory {
                return array_keys( self::getPageList() );
        }
 
-       /**
-        * Get the special page list as an array
-        *
-        * @deprecated since 1.24, use getNames() instead.
-        * @return array
-        */
-       public static function getList() {
-               wfDeprecated( __FUNCTION__, '1.24' );
-               return self::getPageList();
-       }
-
        /**
         * Get the special page list as an array
         *