(bug 15444) API: Throwing a regular 'unknownerror' rather than ('unknownerror', AS_EN...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a5f65b..1a81d12 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -208,7 +208,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Database replication lag doesn't cause all action=edit requests to return the
   nochange flag any more
 * (bug 15392) ApiFormatBase::formatHTML now uses $wgUrlProtocols.
-
+* (bug 15444) action=edit returned "Unknown error: ``AS_END''" where it should
+  return just "Unknown error"
 
 === Languages updated in 1.14 ===
 

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index aaa2559..d019b24 100644 (file)
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -205,7 +205,7 @@ class ApiEditPage extends ApiBase {
                        case EditPage::AS_END:
                                # This usually means some kind of race condition
                                # or DB weirdness occurred. Throw an unknown error here.
-                               $this->dieUsageMsg(array('unknownerror', 'AS_END'));
+                               $this->dieUsageMsg(array('unknownerror'));
                        case EditPage::AS_SUCCESS_NEW_ARTICLE:
                                $r['new'] = '';
                        case EditPage::AS_SUCCESS_UPDATE: