Merge "update.php: Remove max seconds of lag from wfWaitForSlaves() call"

[lhc/web/wiklou.git] / includes / db / DatabaseError.php

diff --git a/includes/db/DatabaseError.php b/includes/db/DatabaseError.php
index 8229c99..86950a8 100644 (file)
--- 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
                        }
                }
@@ -306,7 +306,7 @@ EOT;
                        }
                }
 
-               $cache = HTMLFileCache::newFromTitle( $t, 'view' );
+               $cache = new HTMLFileCache( $t, 'view' );
                if ( $cache->isCached() ) {
                        return $cache->fetchText();
                } else {