From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 19 Mar 2011 17:32:59 +0000 (+0000)
Subject: Block::forUpdate() is never called, and doesn't really make much sense in this contex... 
X-Git-Tag: 1.31.0-rc.0~31316
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=f1b1aafa1d146fe6107d96c97f4abb4175f74cda;p=lhc%2Fweb%2Fwiklou.git

Block::forUpdate() is never called, and doesn't really make much sense in this context anyway; remove it and simplify.
---

diff --git a/includes/Block.php b/includes/Block.php
index 9f27fef770..829650cde8 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -18,7 +18,7 @@ class Block {
 	/* public*/ var $mAddress, $mUser, $mBy, $mReason, $mTimestamp, $mAuto, $mId, $mExpiry,
 				$mRangeStart, $mRangeEnd, $mAnonOnly, $mEnableAutoblock, $mHideName,
 				$mBlockEmail, $mByName, $mAngryAutoblock, $mAllowUsertalk;
-	private $mForUpdate, $mFromMaster;
+	private $mFromMaster;
 
 	const TYPE_USER = 1;
 	const TYPE_IP = 2;
@@ -46,7 +46,6 @@ class Block {
 		$this->mHideName = $hideName;
 		$this->mBlockEmail = $blockEmail;
 		$this->mAllowUsertalk = $allowUsertalk;
-		$this->mForUpdate = false;
 		$this->mFromMaster = false;
 		$this->mByName = $byName;
 		$this->mAngryAutoblock = false;
@@ -125,31 +124,6 @@ class Block {
 		$this->mByName = false;
 	}
 
-	/**
-	 * Get the DB object and set the reference parameter to the select options.
-	 * The options array will contain FOR UPDATE if appropriate.
-	 *
-	 * @param $options Array
-	 * @return Database
-	 */
-	protected function &getDBOptions( &$options ) {
-		global $wgAntiLockFlags;
-
-		if ( $this->mForUpdate || $this->mFromMaster ) {
-			$db = wfGetDB( DB_MASTER );
-			if ( !$this->mForUpdate || ( $wgAntiLockFlags & ALF_NO_BLOCK_LOCK ) ) {
-				$options = array();
-			} else {
-				$options = array( 'FOR UPDATE' );
-			}
-		} else {
-			$db = wfGetDB( DB_SLAVE );
-			$options = array();
-		}
-
-		return $db;
-	}
-
 	/**
 	 * Get a block from the DB, with either the given address or the given username
 	 *
@@ -162,8 +136,7 @@ class Block {
 	public function load( $address = '', $user = 0, $killExpired = true ) {
 		wfDebug( "Block::load: '$address', '$user', $killExpired\n" );
 
-		$options = array();
-		$db = $this->getDBOptions( $options );
+		$db = wfGetDB( $this->mFromMaster ? DB_MASTER : DB_SLAVE );
 
 		if ( 0 == $user && $address === '' ) {
 			# Invalid user specification, not blocked
@@ -175,7 +148,7 @@ class Block {
 		# Try user block
 		if ( $user ) {
 			$res = $db->resultObject( $db->select( 'ipblocks', '*', array( 'ipb_user' => $user ),
-				__METHOD__, $options ) );
+				__METHOD__ ) );
 
 			if ( $this->loadFromResult( $res, $killExpired ) ) {
 				return true;
@@ -300,8 +273,7 @@ class Block {
 		# Blocks should not cross a /16 boundary.
 		$range = substr( $iaddr, 0, 4 );
 
-		$options = array();
-		$db = $this->getDBOptions( $options );
+		$db = wfGetDB( $this->mFromMaster ? DB_MASTER : DB_SLAVE );
 		$conds = array(
 			'ipb_range_start' . $db->buildLike( $range, $db->anyString() ),
 			"ipb_range_start <= '$iaddr'",
@@ -312,7 +284,7 @@ class Block {
 			$conds['ipb_anon_only'] = 0;
 		}
 
-		$res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__, $options ) );
+		$res = $db->resultObject( $db->select( 'ipblocks', '*', $conds, __METHOD__ ) );
 		$success = $this->loadFromResult( $res, $killExpired );
 
 		return $success;
@@ -740,9 +712,10 @@ class Block {
 
 	/**
 	 * Get/set the SELECT ... FOR UPDATE flag
+	 * @deprecated since 1.18
 	 */
 	public function forUpdate( $x = null ) {
-		return wfSetVar( $this->mForUpdate, $x );
+		# noop
 	}
 
 	/**