From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 11 Mar 2012 23:40:33 +0000 (+0000)
Subject: Bug 35162 - Change in Database api break extension MSSQLBackCompat
X-Git-Tag: 1.31.0-rc.0~24160^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=34c77067c36a5ec82b5f8f2a93169c51217f38b8;p=lhc%2Fweb%2Fwiklou.git

Bug 35162 - Change in Database api break extension MSSQLBackCompat

$canonicalDBTypes is probably superfluous information, but doesn't harm as a shortcut

Ping r108051

(imported from SVN)

Change-Id: I09ecf56d984405506f654919a822a939e5a9b1ee
---

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;
 		}