Merge "Replace wgShowExceptionDetails with wgShowDBErrorBacktrace on db errors"

diff --combined includes/exception/MWExceptionRenderer.php
index f713115,873e8f4..c0f1e84
--- 1/includes/exception/MWExceptionRenderer.php
--- 2/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@@ -61,8 -61,7 +61,7 @@@ class MWExceptionRenderer 
                                                "\nBacktrace:\n" . MWExceptionHandler::getRedactedTraceAsString( $eNew );
                                } else {
                                        $message .= "Exception caught inside exception handler.\n\n" .
-                                               "Set \$wgShowExceptionDetails = true; at the bottom of LocalSettings.php " .
-                                               "to show detailed debugging information.";
+                                               self::getShowBacktraceError( $e );
                                }
                                $message .= "\n";
                        } else {
@@@ -74,7 -73,11 +73,7 @@@
                                        $message = MWExceptionHandler::getPublicLogMessage( $e );
                                }
                        }
 -                      if ( self::isCommandLine() ) {
 -                              self::printError( $message );
 -                      } else {
 -                              echo nl2br( htmlspecialchars( $message ) ) . "\n";
 -                      }
 +                      echo nl2br( htmlspecialchars( $message ) ) . "\n";
                }
        }
  
@@@ -222,9 -225,7 +221,7 @@@
                                        $logId,
                                        MWExceptionHandler::getURL()
                                ) . "</div>\n" .
-                       "<!-- Set \$wgShowExceptionDetails = true; " .
-                       "at the bottom of LocalSettings.php to show detailed " .
-                       "debugging information. -->";
+                               "<!-- " . wordwrap( self::getShowBacktraceError( $e ), 50 ) . " -->";
                }
  
                return $html;
@@@ -258,8 -259,7 +255,7 @@@
                                "\nBacktrace:\n" .
                                MWExceptionHandler::getRedactedTraceAsString( $e ) . "\n";
                } else {
-                       return "Set \$wgShowExceptionDetails = true; " .
-                               "in LocalSettings.php to show detailed debugging information.\n";
+                       return self::getShowBacktraceError( $e );
                }
        }
  
@@@ -276,6 -276,23 +272,23 @@@
                );
        }
  
+       /**
+        * @param Exception|Throwable $e
+        * @return string
+        */
+       private static function getShowBacktraceError( $e ) {
+               global $wgShowExceptionDetails, $wgShowDBErrorBacktrace;
+               $vars = [];
+               if ( !$wgShowExceptionDetails ) {
+                       $vars[] = '$wgShowExceptionDetails = true;';
+               }
+               if ( $e instanceof DBError && !$wgShowDBErrorBacktrace ) {
+                       $vars[] = '$wgShowDBErrorBacktrace = true;';
+               }
+               $vars = implode( ' and ', $vars );
+               return "Set $vars at the bottom of LocalSettings.php to show detailed debugging information";
+       }
+ 
        /**
         * @return bool
         */