* (bug 1477) hide details of SQL error messages by default

  Set $wgShowSQLErrors = true for debugging.

    Removed unused settings $wgBufferSQLResults and $wgShowSQLErrors.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8cd46c4..42c981f 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -581,7 +581,7 @@ class OutputPage {
        }
 
        function databaseError( $fname, $sql, $error, $errno ) {
-               global $wgUser, $wgCommandLineMode;
+               global $wgUser, $wgCommandLineMode, $wgShowSQLErrors;
 
                $this->setPageTitle( wfMsgNoDB( 'databaseerror' ) );
                $this->setRobotpolicy( 'noindex,nofollow' );
@@ -589,12 +589,20 @@ class OutputPage {
                $this->enableClientCache( false );
                $this->mRedirect = '';
 
-               if ( $wgCommandLineMode ) {
-                       $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
-                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+               if( $wgShowSQLErrors ) {
+                       if ( $wgCommandLineMode ) {
+                               $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
+                                                       htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+                       } else {
+                               $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
+                                                       htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+                       }
                } else {
-                       $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
-                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+                       if( $wgCommandLineMode ) {
+                               $msg = wfMsg( 'internalerror' );
+                       } else {
+                               $msg = htmlspecialchars( wfMsg( 'internalerror' ) );
+                       }
                }
 
                if ( $wgCommandLineMode || !is_object( $wgUser )) {