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.heureux-cyclage.org/?a=commitdiff_plain;h=b3e4d0518f341b041c9e634a0b0f3053c3c32e8c;hp=366d15a6661b54c0626a521325ad9fc99a785a78;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/db/Database.php b/includes/db/Database.php
index cf973206e2..3fa1335e2c 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -265,7 +265,7 @@ abstract class DatabaseBase implements IDatabase, LoggerAwareInterface {
 
 		$this->srvCache = isset( $params['srvCache'] )
 			? $params['srvCache']
-			: new EmptyBagOStuff();
+			: new HashBagOStuff();
 
 		$this->profiler = isset( $params['profiler'] )
 			? $params['profiler']