X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiMain.php;h=604fdf9e70ef660f7a68ed33d8b409ec72ce8442;hb=9012dfe523854a125e781d6fb7d255431615d95a;hp=59227d91e9eb74be33d40798662ea00c43a6c95a;hpb=f70c7a06de8776cd7b4ebdc6fe04932c6d1feaec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 59227d91e9..604fdf9e70 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -26,6 +26,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use Wikimedia\Timestamp\TimestampException;
 
 /**
  * This is the main API class, used for both external and internal processing.
@@ -574,7 +575,7 @@ class ApiMain extends ApiBase {
 	 * @param Exception $e
 	 */
 	protected function handleException( Exception $e ) {
-		// Bug 63145: Rollback any open database transactions
+		// T65145: Rollback any open database transactions
 		if ( !( $e instanceof ApiUsageException || $e instanceof UsageException ) ) {
 			// UsageExceptions are intentional, so don't rollback if that's the case
 			try {
@@ -1116,7 +1117,9 @@ class ApiMain extends ApiBase {
 				)
 			);
 		} else {
-			if ( $config->get( 'ShowExceptionDetails' ) ) {
+			if ( $config->get( 'ShowExceptionDetails' ) &&
+				( !$e instanceof DBError || $config->get( 'ShowDBErrorBacktrace' ) )
+			) {
 				$result->addContentValue(
 					$path,
 					'trace',
@@ -1666,7 +1669,7 @@ class ApiMain extends ApiBase {
 		$ret = $this->getRequest()->getVal( $name );
 		if ( $ret === null ) {
 			if ( $this->getRequest()->getArray( $name ) !== null ) {
-				// See bug 10262 for why we don't just implode( '|', ... ) the
+				// See T12262 for why we don't just implode( '|', ... ) the
 				// array.
 				$this->addWarning( [ 'apiwarn-unsupportedarray', $name ] );
 			}