Merge "Remove legacy handling for EditFilterMergedContent hook"

This commit is contained in:
jenkins-bot 2022-04-27 16:10:50 +00:00 committed by Gerrit Code Review
commit 6e047225cc

View file

@ -24,7 +24,6 @@ namespace MediaWiki\Extension\Gadgets;
*/ */
use Content; use Content;
use EditPage;
use Exception; use Exception;
use HTMLForm; use HTMLForm;
use IContextSource; use IContextSource;
@ -330,8 +329,6 @@ class Hooks implements
$validateStatus = $content->validate(); $validateStatus = $content->validate();
if ( !$validateStatus->isGood() ) { if ( !$validateStatus->isGood() ) {
$status->merge( $validateStatus ); $status->merge( $validateStatus );
// @todo Remove this line after this extension do not support mediawiki version 1.36 and before
$status->value = EditPage::AS_HOOK_ERROR_EXPECTED;
return false; return false;
} }
} else { } else {