Siebrand has submitted this change and it was merged.

Change subject: Fix hook signature (follow-up to I8b6a75a3).
......................................................................


Fix hook signature (follow-up to I8b6a75a3).

Use separate entry points for the old EditFilterMerged and the new 
EditFilterMergedContent
hooks, since their signature differ quite a bit.

This also fixes the actual error reporting, which was broken for
the new hook.

Note: This is UNTESTED, since i don't know whow to set up Translate for testing 
this.

Change-Id: I896d08b49706f96af525770816f08ff68a70d04e
---
M TranslateHooks.php
M tag/PageTranslationHooks.php
2 files changed, 42 insertions(+), 24 deletions(-)

Approvals:
  Siebrand: Verified; Looks good to me, approved
  jenkins-bot: Checked


--
To view, visit https://gerrit.wikimedia.org/r/42746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I896d08b49706f96af525770816f08ff68a70d04e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to