More informative database errors with SQL suppressed

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 61f9ee3..f00c58a 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -599,20 +599,16 @@ class OutputPage {
                $this->enableClientCache( false );
                $this->mRedirect = '';
 
-               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 ) );
-                       }
+               if( !$wgShowSQLErrors ) {
+                       $sql = wfMsg( 'sqlhidden' );
+               }
+
+               if ( $wgCommandLineMode ) {
+                       $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
+                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                } else {
-                       if( $wgCommandLineMode ) {
-                               $msg = wfMsg( 'internalerror' );
-                       } else {
-                               $msg = htmlspecialchars( wfMsg( 'internalerror' ) );
-                       }
+                       $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
+                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                }
 
                if ( $wgCommandLineMode || !is_object( $wgUser )) {

diff --git a/languages/Language.php b/languages/Language.php
index 871658c..d674223 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -543,6 +543,7 @@ a number of reasons why this may be so, please see
 
 You can view and copy the source of this page:",
 'seriousxhtmlerrors' => 'There were serious xhtml markup errors detected by tidy.',
+'sqlhidden' => '(SQL query hidden)',
 
 # Login and logout pages
 #