From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 15 Sep 2016 18:43:22 +0000 (+0000)
Subject: Merge "Fix default "srvCache" BagOStuff in DatabaseBase"
X-Git-Tag: 1.31.0-rc.0~5548
X-Git-Url: http://git.cyclocoop.org//%22%22.url_de_base%28%29.%22/%22?a=commitdiff_plain;h=b3e4d0518f341b041c9e634a0b0f3053c3c32e8c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix default "srvCache" BagOStuff in DatabaseBase"
---

b3e4d0518f341b041c9e634a0b0f3053c3c32e8c
diff --cc includes/db/Database.php
index cf973206e2,dc67e9ea2f..3fa1335e2c
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@@ -263,9 -263,11 +263,9 @@@ abstract class DatabaseBase implements 
  
  		$this->mSessionVars = $params['variables'];
  
 -		$this->mForeign = $params['foreign'];
 -
  		$this->srvCache = isset( $params['srvCache'] )
  			? $params['srvCache']
- 			: new EmptyBagOStuff();
+ 			: new HashBagOStuff();
  
  		$this->profiler = isset( $params['profiler'] )
  			? $params['profiler']