From 7c577f96ecf173bd17b3f2ef37a763bb938830ec Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Fri, 10 Dec 2010 14:04:00 +0000 Subject: [PATCH] One more $wgDBtype. I think this is the last offender in core; all the remaining usages are justified --- includes/BagOStuff.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/BagOStuff.php b/includes/BagOStuff.php index d5f49e236c..70a87a7789 100644 --- a/includes/BagOStuff.php +++ b/includes/BagOStuff.php @@ -240,14 +240,12 @@ class SqlBagOStuff extends BagOStuff { var $lastExpireAll = 0; protected function getDB() { - global $wgDBtype; - if ( !isset( $this->db ) ) { /* We must keep a separate connection to MySQL in order to avoid deadlocks * However, SQLite has an opposite behaviour. * @todo Investigate behaviour for other databases */ - if ( $wgDBtype == 'sqlite' ) { + if ( wfGetDB( DB_MASTER )->getType() == 'sqlite' ) { $this->db = wfGetDB( DB_MASTER ); } else { $this->lb = wfGetLBFactory()->newMainLB(); -- 2.20.1