https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113601
Revision: 113601
Author: reedy
Date: 2012-03-11 23:40:33 +0000 (Sun, 11 Mar 2012)
Log Message:
-----------
Bug 35162 - Change in Database api break extension MSSQLBackCompat
$canonicalDBTypes is probably superfluous information, but doesn't harm as a
shortcut
Ping r108051
Modified Paths:
--------------
trunk/phase3/includes/db/Database.php
Modified: trunk/phase3/includes/db/Database.php
===================================================================
--- trunk/phase3/includes/db/Database.php 2012-03-11 23:35:51 UTC (rev
113600)
+++ trunk/phase3/includes/db/Database.php 2012-03-11 23:40:33 UTC (rev
113601)
@@ -680,7 +680,7 @@
$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 @@
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;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
