dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a548c1d
)
One more $wgDBtype. I think this is the last offender in core; all the remaining...
author
Chad Horohoe
<demon@users.mediawiki.org>
Fri, 10 Dec 2010 14:04:00 +0000
(14:04 +0000)
committer
Chad Horohoe
<demon@users.mediawiki.org>
Fri, 10 Dec 2010 14:04:00 +0000
(14:04 +0000)
includes/BagOStuff.php
patch
|
blob
|
history
diff --git
a/includes/BagOStuff.php
b/includes/BagOStuff.php
index
d5f49e2
..
70a87a7
100644
(file)
--- 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();