From 27112ed203fa606856d6331d956831d9b16eba88 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Wed, 10 Oct 2018 15:19:56 -0700
Subject: [PATCH] Drop DoEditSectionLink, deprecated since 1.25

Change-Id: I78b468da34467863047cd01623997dc67cc4fc76
---
 RELEASE-NOTES-1.32      |  2 ++
 docs/hooks.txt          | 13 -------------
 includes/skins/Skin.php |  6 ------
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 10244c0a8b..ba05a4fd42 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -340,6 +340,8 @@ because of Phabricator reports.
   removed. Use the 'ChangesListSpecialPageStructuredFilters' hook instead.
 * DeferredUpdates::setImmediateMode(), deprecated since 1.29, has been removed.
 * File / MediaHandler::getStreamHeaders(), deprecated since 1.30, was removed.
+* The hook 'DoEditSectionLink', deprecated since 1.25, has been removed. Use
+  the hook 'SkinEditSectionLinks' instead.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit
diff --git a/docs/hooks.txt b/docs/hooks.txt
index a47f68f1a2..e80e179990 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1385,19 +1385,6 @@ an article
 &$article: article (object) being viewed
 &$oldid: oldid (int) being viewed
 
-'DoEditSectionLink': DEPRECATED since 1.25! Use SkinEditSectionLinks instead.
-Override the HTML generated for section edit links
-$skin: Skin object rendering the UI
-$title: Title object for the title being linked to (may not be the same as
-  the page title, if the section is included from a template)
-$section: The designation of the section being pointed to, to be included in
-  the link, like "&section=$section"
-$tooltip: The default tooltip.  Escape before using.
-  By default, this is wrapped in the 'editsectionhint' message.
-&$result: The HTML to return, prefilled with the default plus whatever other
-  changes earlier hooks have made
-$lang: The language code to use for the link in the wfMessage function
-
 'EditFilter': Perform checks on an edit
 $editor: EditPage instance (object). The edit form (see includes/EditPage.php)
 $text: Contents of the edit box
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index ed4045d487..98219d0eba 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -1659,12 +1659,6 @@ abstract class Skin extends ContextSource {
 		);
 
 		$result .= '<span class="mw-editsection-bracket">]</span></span>';
-		// Deprecated, use SkinEditSectionLinks hook instead
-		Hooks::run(
-			'DoEditSectionLink',
-			[ $this, $nt, $section, $tooltip, &$result, $lang ],
-			'1.25'
-		);
 		return $result;
 	}
 
-- 
2.20.1