X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiMain.php;h=6d76f8c94435c446ad939af4a358c8364fd7340b;hp=5d0d4b1c800182358a08f9747809d27b04773ded;hb=6cdcc7416c64a635df9aa15170d2df13ecbbd82d;hpb=50e796e948173506d98a39197cde7982fbc2c5ca

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 5d0d4b1c80..6d76f8c944 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1116,7 +1116,9 @@ class ApiMain extends ApiBase {
 				)
 			);
 		} else {
-			if ( $config->get( 'ShowExceptionDetails' ) ) {
+			if ( $config->get( 'ShowExceptionDetails' ) &&
+				( !$e instanceof DBError || $config->get( 'ShowDBErrorBacktrace' ) )
+			) {
 				$result->addContentValue(
 					$path,
 					'trace',