From 3000943df0c4558bff00896b7c7442f26c5f42d3 Mon Sep 17 00:00:00 2001
From: Liangent <liangent@gmail.com>
Date: Fri, 6 Jun 2014 00:58:31 +0000
Subject: [PATCH] Remove $dbr from ChangeTags::addTags()

$dbr (DB_SLAVE) is completely unused now.

Change-Id: I02bbde8366480b841d8028403e9a0efe88fa46fd
---
 includes/ChangeTags.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index e14f6baafa..28db8a1bdb 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -101,19 +101,20 @@ class ChangeTags {
 				'specified when adding a tag to a change!' );
 		}
 
+		$dbw = wfGetDB( DB_MASTER );
+
 		// Might as well look for rcids and so on.
 		if ( !$rc_id ) {
 			// Info might be out of date, somewhat fractionally, on slave.
-			$dbr = wfGetDB( DB_MASTER );
 			if ( $log_id ) {
-				$rc_id = $dbr->selectField(
+				$rc_id = $dbw->selectField(
 					'recentchanges',
 					'rc_id',
 					array( 'rc_logid' => $log_id ),
 					__METHOD__
 				);
 			} elseif ( $rev_id ) {
-				$rc_id = $dbr->selectField(
+				$rc_id = $dbw->selectField(
 					'recentchanges',
 					'rc_id',
 					array( 'rc_this_oldid' => $rev_id ),
@@ -122,14 +123,13 @@ class ChangeTags {
 			}
 		} elseif ( !$log_id && !$rev_id ) {
 			// Info might be out of date, somewhat fractionally, on slave.
-			$dbr = wfGetDB( DB_MASTER );
-			$log_id = $dbr->selectField(
+			$log_id = $dbw->selectField(
 				'recentchanges',
 				'rc_logid',
 				array( 'rc_id' => $rc_id ),
 				__METHOD__
 			);
-			$rev_id = $dbr->selectField(
+			$rev_id = $dbw->selectField(
 				'recentchanges',
 				'rc_this_oldid',
 				array( 'rc_id' => $rc_id ),
@@ -144,7 +144,6 @@ class ChangeTags {
 		);
 
 		## Update the summary row.
-		$dbw = wfGetDB( DB_MASTER );
 		// $prevTags can be out of date on slaves, especially when addTags is called consecutively,
 		// causing loss of tags added recently in tag_summary table.
 		$prevTags = $dbw->selectField( 'tag_summary', 'ts_tags', $tsConds, __METHOD__ );
-- 
2.20.1