jenkins-bot has submitted this change and it was merged.
Change subject: Better error message via api when content model does not allow
editing
......................................................................
Better error message via api when content model does not allow editing
Change-Id: I699b4f5fd2eac8dfc4c54922474f939262bc803d
---
M includes/api/ApiEditPage.php
M tests/phpunit/includes/api/ApiEditPageTest.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index e70b8f0..b623849 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -96,9 +96,11 @@
$contentHandler = ContentHandler::getForModelID(
$params['contentmodel'] );
}
+ $name = $titleObj->getPrefixedDBkey();
+ $model = $contentHandler->getModelID();
if ( $contentHandler->supportsDirectApiEditing() === false ) {
$this->dieUsage(
- 'Direct editing via API is not supported for
this content type.',
+ "Direct editing via API is not supported for
content model $model used by $name",
'no-direct-editing'
);
}
@@ -110,8 +112,6 @@
$contentFormat = $params['contentformat'];
if ( !$contentHandler->isSupportedFormat( $contentFormat ) ) {
- $name = $titleObj->getPrefixedDBkey();
- $model = $contentHandler->getModelID();
$this->dieUsage( "The requested format $contentFormat
is not supported for content model " .
" $model used by $name", 'badformat' );
diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php
b/tests/phpunit/includes/api/ApiEditPageTest.php
index fa528da..e006bf7 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -475,7 +475,7 @@
public function testCheckDirectApiEditingDisallowed_forNonTextContent()
{
$this->setExpectedException(
'UsageException',
- 'Direct editing via API is not supported for this
content type.'
+ 'Direct editing via API is not supported for content
model testing used by Dummy:ApiEditPageTest_nonTextPageEdit'
);
$this->doApiRequestWithToken( array(
--
To view, visit https://gerrit.wikimedia.org/r/219487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I699b4f5fd2eac8dfc4c54922474f939262bc803d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Tpt <thoma...@hotmail.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
