From: Reedy <reedy@wikimedia.org>
Date: Thu, 6 Oct 2016 14:20:00 +0000 (+0100)
Subject: Deprecate EditFilterMerged hook, final ContentHandler replaced hook
X-Git-Tag: 1.31.0-rc.0~5105^2
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=6604db9a0a4e6ec606c2246d24dd96df83223629;p=lhc%2Fweb%2Fwiklou.git

Deprecate EditFilterMerged hook, final ContentHandler replaced hook

Bug: T145728
Bug: T147391
Change-Id: I9b9acb43b7ec081dc8c6f8e918ae60a317fa6bb7
---

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 78986d7b36..ad3a1715ff 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -215,8 +215,8 @@ changes to languages because of Phabricator reports.
   migrate to using the same functions on a ProxyLookup instance, obtainable from
   MediaWikiServices.
 * The ArticleAfterFetchContent, ArticleInsertComplete, ArticleSave, ArticleSaveComplete,
-  ArticleViewCustom, EditPageGetDiffText, EditPageGetPreviewText and ShowRawCssJs hooks
-  will now emit deprecation warnings if used.
+  ArticleViewCustom, EditFilterMerged, EditPageGetDiffText, EditPageGetPreviewText and
+  ShowRawCssJs hooks will now emit deprecation warnings if used.
 
 == Compatibility ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 8ca7105684..d021382bbb 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1613,7 +1613,8 @@ class EditPage {
 	protected function runPostMergeFilters( Content $content, Status $status, User $user ) {
 		// Run old style post-section-merge edit filter
 		if ( !ContentHandler::runLegacyHooks( 'EditFilterMerged',
-			[ $this, $content, &$this->hookError, $this->summary ]
+			[ $this, $content, &$this->hookError, $this->summary ],
+			'1.21'
 		) ) {
 			# Error messages etc. could be handled within the hook...
 			$status->fatal( 'hookaborted' );