Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors in an...
authorBrad Jorsch <bjorsch@wikimedia.org>
Fri, 26 Jan 2018 17:12:28 +0000 (09:12 -0800)
committerBrad Jorsch <bjorsch@wikimedia.org>
Fri, 26 Jan 2018 17:15:18 +0000 (09:15 -0800)
commit268fefee97fbf8466bcd63dddf915b9089d2968a
treece812cdde20a5484b55e317bf55a5bc34516fd57
parent276e1296ac8f8e040b5f7676fd7870cae153c894
Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors in an errorbox""

Instead of making a one-line fix to fix the issue in T149473, the change
was reverted.

This reverts commit 022f26e9fd3ae865331f3bb1b3eec63e212240c9.
This reverts commit 12f170502cfef525344ae69caef6240eaafbf63f.

Bug: T149473
Bug: T185638
Change-Id: Ib44ba2a6d2405309ad91bcc4d6440d05b67379da
includes/EditPage.php
languages/i18n/en.json
languages/i18n/qqq.json