}
function databaseError( $fname, $sql, $error, $errno ) {
- global $wgUser, $wgCommandLineMode;
+ global $wgUser, $wgCommandLineMode, $wgShowSQLErrors;
$this->setPageTitle( wfMsgNoDB( 'databaseerror' ) );
$this->setRobotpolicy( 'noindex,nofollow' );
$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 )) {