From c6f38f8bf632651d1239de4a1d2deeabdb424db7 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sun, 11 Mar 2012 23:40:33 +0000 Subject: [PATCH] Bug 35162 - Change in Database api break extension MSSQLBackCompat $canonicalDBTypes is probably superfluous information, but doesn't harm as a shortcut Ping r108051 --- includes/db/Database.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/db/Database.php b/includes/db/Database.php index 47eb596d6a..5c03617445 100644 --- a/includes/db/Database.php +++ b/includes/db/Database.php @@ -680,7 +680,7 @@ abstract class DatabaseBase implements DatabaseType { $dbType = strtolower( $dbType ); $class = 'Database' . ucfirst( $dbType ); - if( in_array( $dbType, $canonicalDBTypes ) ) { + if( in_array( $dbType, $canonicalDBTypes ) || ( class_exists( $class ) && is_subclass_of( $class, 'DatabaseBase' ) ) ) { return new $class( isset( $p['host'] ) ? $p['host'] : false, isset( $p['user'] ) ? $p['user'] : false, @@ -689,8 +689,6 @@ abstract class DatabaseBase implements DatabaseType { isset( $p['flags'] ) ? $p['flags'] : 0, isset( $p['tablePrefix'] ) ? $p['tablePrefix'] : 'get from global' ); - } elseif ( class_exists( $class ) && is_subclass_of( $class, 'DatabaseBase' ) ) { - return new $class( $p ); } else { return null; } -- 2.20.1