Follow-up to r?????:

PHP Catchable fatal error:  Argument 1 passed to DBError::__construct() must be an instance of Database, instance of DatabaseMysql given, called in /var/www/w/includes/db/Database.php on line 2736 and defined in /var/www/w/includes/db/Database.php on line 2547

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 7bb5223..fe31766 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2560,7 +2560,7 @@ class DBError extends MWException {
         * @param $db Database object which threw the error
         * @param $error A simple error message to be used for debugging
         */
-       function __construct( Database &$db, $error ) {
+       function __construct( DatabaseBase &$db, $error ) {
                $this->db =& $db;
                parent::__construct( $error );
        }
@@ -2572,7 +2572,7 @@ class DBError extends MWException {
 class DBConnectionError extends DBError {
        public $error;
        
-       function __construct( Database &$db, $error = 'unknown error' ) {
+       function __construct( DatabaseBase &$db, $error = 'unknown error' ) {
                $msg = 'DB connection error';
                if ( trim( $error ) != '' ) {
                        $msg .= ": $error";