From 88a723bd872425b4dfd9ae12954f17a7b383bc02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 13 Dec 2019 15:45:24 +0100 Subject: [PATCH] ApiEditPage: Fix error message for edit conflicts The 'editconflict' message is used by the normal edit form, and it expects a parameter (page name), which was never passed. 'edit-conflict' should have been used instead. This doesn't change the error code, which is mapped in ApiMessageTrait and it already has a case for 'edit-conflict'/'editconflict'. Change-Id: Ic95af27a67b95310b27ec344503d0a5cd88d79a2 --- includes/api/ApiEditPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php index d1773e5d717..0c946b1c036 100644 --- a/includes/api/ApiEditPage.php +++ b/includes/api/ApiEditPage.php @@ -473,7 +473,7 @@ class ApiEditPage extends ApiBase { $status->fatal( 'apierror-pagedeleted' ); break; case EditPage::AS_CONFLICT_DETECTED: - $status->fatal( 'editconflict' ); + $status->fatal( 'edit-conflict' ); break; // Currently shouldn't be needed, but here in case