Drop DoEditSectionLink, deprecated since 1.25

Change-Id: I78b468da34467863047cd01623997dc67cc4fc76

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 10244c0..ba05a4f 100644 (file)
--- 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 a47f68f..e80e179 100644 (file)
--- 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 ed4045d..98219d0 100644 (file)
--- 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;
        }