From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 24 Jan 2011 18:45:59 +0000 (+0000)
Subject: Fix for r80864: the $dbname variable was not there only to make pretty debug output... 
X-Git-Tag: 1.31.0-rc.0~32391
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=c2379cd884c0ebf724b7da8520afbd6391710106;p=lhc%2Fweb%2Fwiklou.git

Fix for r80864: the $dbname variable was not there only to make pretty debug output, but also to let the connection choose the correct database. This was breaking connections to other databases since they were always using wiki's database.
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 59cd513e1d..15a0ad39f8 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -624,7 +624,7 @@ class LoadBalancer {
 		$dbname = $server['dbname'];
 
 		if ( $dbNameOverride !== false ) {
-			$dbname = $dbNameOverride;
+			$server['dbname'] = $dbname = $dbNameOverride;
 		}
 
 		# Create object