From 80964798ae357ecff8627368880ca31fef88c2fd Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 3 Dec 2012 18:20:29 +0100 Subject: [PATCH] (no bug) Fix per-connection db name in ORMTable. ORMTable was bypassing the mechanism used by DBAccessBase to ensure that the correct database name is selected when getting a database connection. Change-Id: Ic82ce46f1852dcaa5f52b40660ba4a9f52df22f6 --- includes/db/ORMTable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/db/ORMTable.php b/includes/db/ORMTable.php index 13c2d9ff2c..a2ef9445cb 100644 --- a/includes/db/ORMTable.php +++ b/includes/db/ORMTable.php @@ -463,7 +463,7 @@ abstract class ORMTable extends DBAccessBase implements IORMTable { * @return DatabaseBase The database object */ public function getReadDbConnection() { - return $this->getLoadBalancer()->getConnection( $this->getReadDb(), array(), $this->getTargetWiki() ); + return $this->getConnection( $this->getReadDb(), array() ); } /** @@ -477,7 +477,7 @@ abstract class ORMTable extends DBAccessBase implements IORMTable { * @return DatabaseBase The database object */ public function getWriteDbConnection() { - return $this->getLoadBalancer()->getConnection( DB_MASTER, array(), $this->getTargetWiki() ); + return $this->getConnection( DB_MASTER, array() ); } /** -- 2.20.1