From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/db/DatabaseError.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'includes/db/DatabaseError.php') diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php index 2dfec41d..86950a89 100644 --- a/includes/db/DatabaseError.php +++ b/includes/db/DatabaseError.php @@ -168,12 +168,12 @@ class DBConnectionError extends DBExpectedError { if ( $wgShowHostnames || $wgShowSQLErrors ) { $info = str_replace( '$1', Html::element( 'span', array( 'dir' => 'ltr' ), $this->error ), - htmlspecialchars( $this->msg( 'dberr-info', '(Cannot contact the database server: $1)' ) ) + htmlspecialchars( $this->msg( 'dberr-info', '(Cannot access the database: $1)' ) ) ); } else { $info = htmlspecialchars( $this->msg( 'dberr-info-hidden', - '(Cannot contact the database server)' + '(Cannot access the database)' ) ); } @@ -229,7 +229,7 @@ class DBConnectionError extends DBExpectedError { return; } - } catch ( MWException $e ) { + } catch ( Exception $e ) { // Do nothing, just use the default page } } -- cgit v1.2.3-54-g00ecf