From 9b9636db03809fc8936751847cdb462cba6e833a Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 13 Oct 2008 18:38:01 +0000 Subject: [PATCH] Revert r41506 and make LoadBalancer::openForeignConnection() call Database::tablePrefix() on successful new connection --- includes/db/LoadBalancer.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php index b44f067184..f847fe22af 100644 --- a/includes/db/LoadBalancer.php +++ b/includes/db/LoadBalancer.php @@ -598,6 +598,7 @@ class LoadBalancer { $this->mErrorConnection = $conn; $conn = false; } else { + $conn->tablePrefix( $prefix ); $this->mConns['foreignUsed'][$i][$wiki] = $conn; wfDebug( __METHOD__.": opened new connection for $i/$wiki\n" ); } @@ -638,17 +639,12 @@ class LoadBalancer { $dbname = $dbNameOverride; } - if( !isset( $prefix ) ){ - global $wgDBprefix; - $prefix = $wgDBprefix; - } - # Get class for this database type $class = 'Database' . ucfirst( $type ); # Create object wfDebug( "Connecting to $host $dbname...\n" ); - $db = new $class( $host, $user, $password, $dbname, 1, $flags, $prefix ); + $db = new $class( $host, $user, $password, $dbname, 1, $flags ); if ( $db->isOpen() ) { wfDebug( "Connected\n" ); } else { -- 2.20.1