jenkins-bot has submitted this change and it was merged.
Change subject: API: Clean up uncaught exception backtrace output
......................................................................
API: Clean up uncaught exception backtrace output
The existing response seems to be designed to look good with
format=xmlfm, which doesn't make much sense now that format=jsonfm is
the default.
Change-Id: Ic3993aaf7e401d6233bbbe4522e77004099e3c40
---
M includes/api/ApiMain.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 99f90ee..1544189 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -712,12 +712,12 @@
'code' => 'internal_api_error_' . get_class( $e
),
'info' => '[' . MWExceptionHandler::getLogId(
$e ) . '] ' . $info,
);
- ApiResult::setContent(
- $errMessage,
- $config->get( 'ShowExceptionDetails' )
- ? "\n\n" .
MWExceptionHandler::getRedactedTraceAsString( $e ) . "\n\n"
- : ''
- );
+ if ( $config->get( 'ShowExceptionDetails' ) ) {
+ ApiResult::setContent(
+ $errMessage,
+
MWExceptionHandler::getRedactedTraceAsString( $e )
+ );
+ }
}
// Remember all the warnings to re-add them later
--
To view, visit https://gerrit.wikimedia.org/r/182089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3993aaf7e401d6233bbbe4522e77004099e3c40
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
