From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 30 Mar 2015 18:15:01 +0000 (-0700)
Subject: Removed unused parameter from User::checkNewtalk
X-Git-Tag: 1.31.0-rc.0~11936^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=4f8dc27b90ae903f72bcd8a7cbfa708a2f8b68fd;p=lhc%2Fweb%2Fwiklou.git

Removed unused parameter from User::checkNewtalk

Change-Id: I112fc32d9985664ab5edea842f52f62554c082ea
---

diff --git a/includes/User.php b/includes/User.php
index 7f30263c86..ad3d425255 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2119,17 +2119,13 @@ class User implements IDBAccessObject {
 	 * @see getNewtalk()
 	 * @param string $field 'user_ip' for anonymous users, 'user_id' otherwise
 	 * @param string|int $id User's IP address for anonymous users, User ID otherwise
-	 * @param bool $fromMaster True to fetch from the master, false for a slave
 	 * @return bool True if the user has new messages
 	 */
-	protected function checkNewtalk( $field, $id, $fromMaster = false ) {
-		if ( $fromMaster ) {
-			$db = wfGetDB( DB_MASTER );
-		} else {
-			$db = wfGetDB( DB_SLAVE );
-		}
-		$ok = $db->selectField( 'user_newtalk', $field,
-			array( $field => $id ), __METHOD__ );
+	protected function checkNewtalk( $field, $id ) {
+		$dbr = wfGetDB( DB_SLAVE );
+
+		$ok = $dbr->selectField( 'user_newtalk', $field, array( $field => $id ), __METHOD__ );
+
 		return $ok !== false;
 	}