Merge "Remove deprecated method insertArticleLink() from class ChangeList"

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index af67dc7..5280758 100644 (file)
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -253,6 +253,8 @@ because of Phabricator reports.
 * Removed deprecated class property WikiRevision::$importer.
 * ResourceLoaderFileModule::readStyleFiles() now requires its $context
   parameter.
+* The ChangeList::insertArticleLink() method, that was deprecated in 1.27, has
+  been removed.
 
 === Deprecations in 1.33 ===
 * The configuration option $wgUseESI has been deprecated, and is expected

diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index 7a54f95..b8ab971 100644 (file)
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -472,17 +472,6 @@ class ChangesList extends ContextSource {
                        ' <span class="mw-changeslist-separator"></span> ';
        }
 
-       /**
-        * @param string &$s Article link will be appended to this string, in place.
-        * @param RecentChange $rc
-        * @param bool $unpatrolled
-        * @param bool $watched
-        * @deprecated since 1.27, use getArticleLink instead.
-        */
-       public function insertArticleLink( &$s, RecentChange $rc, $unpatrolled, $watched ) {
-               $s .= $this->getArticleLink( $rc, $unpatrolled, $watched );
-       }
-
        /**
         * @param RecentChange &$rc
         * @param bool $unpatrolled