From 52e1947dcdb4c37dcf66183b855645e0e56ea3c2 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 22 May 2015 16:31:06 -0700 Subject: [PATCH] Actually set the $res field via doQuery() in setVisibility * Otherwise, it is thrown away and redone on a slave Change-Id: I1252fa5bc98d908cf289f4d93cbdd8d6d33828ea --- includes/revisiondelete/RevDelList.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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__ ); -- 2.20.1