From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 22 May 2015 23:31:06 +0000 (-0700)
Subject: Actually set the $res field via doQuery() in setVisibility
X-Git-Tag: 1.31.0-rc.0~11320
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=52e1947dcdb4c37dcf66183b855645e0e56ea3c2;p=lhc%2Fweb%2Fwiklou.git

Actually set the $res field via doQuery() in setVisibility

* Otherwise, it is thrown away and redone on a slave

Change-Id: I1252fa5bc98d908cf289f4d93cbdd8d6d33828ea
---

diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index 7a3ddfea93..1ce96914f3 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -89,9 +89,10 @@ abstract class RevDelList extends RevisionListBase {
 		$comment = $params['comment'];
 		$perItemStatus = isset( $params['perItemStatus'] ) ? $params['perItemStatus'] : false;
 
-		$this->res = false;
+		// CAS-style checks are done on the _deleted fields so the select
+		// does not need to use FOR UPDATE nor be in the atomic section
 		$dbw = wfGetDB( DB_MASTER );
-		$this->doQuery( $dbw );
+		$this->res = $this->doQuery( $dbw );
 
 		$dbw->startAtomic( __METHOD__ );