jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/378081 )
Change subject: Properly unset AlternateEdit hook to avoid recursion ...................................................................... Properly unset AlternateEdit hook to avoid recursion Change-Id: I6d7b69849271106f3abbc5598556ae4d7398793a --- M includes/TwoColConflictHooks.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php index 5ba210e..ed9c268 100644 --- a/includes/TwoColConflictHooks.php +++ b/includes/TwoColConflictHooks.php @@ -32,7 +32,7 @@ return true; } - $key = array_search( 'TwoColConflictHooks::onAlternateEdit', $wgHooks ); + $key = array_search( 'TwoColConflictHooks::onAlternateEdit', $wgHooks['AlternateEdit'] ); unset( $wgHooks[ 'AlternateEdit' ][ $key ] ); $twoColConflictPage = new TwoColConflictPage( $editPage->mArticle ); -- To view, visit https://gerrit.wikimedia.org/r/378081 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d7b69849271106f3abbc5598556ae4d7398793a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits