From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 24 Mar 2016 20:53:55 +0000 (-0700)
Subject: Avoid master queries on deletion form view
X-Git-Tag: 1.31.0-rc.0~7511^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=494aa62942726dec73c291050f95dd3b3dd2e409

Avoid master queries on deletion form view

Bug: T92357
Change-Id: I9c785e8e541f0e4fb7fa0f11cab2d33c26f7fb3a
---

diff --git a/includes/page/Article.php b/includes/page/Article.php
index d57d3fdd56..7592017ca3 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1644,6 +1644,7 @@ class Article implements Page {
 		$title = $this->getTitle();
 		$context = $this->getContext();
 		$user = $context->getUser();
+		$request = $context->getRequest();
 
 		# Check permissions
 		$permissionErrors = $title->getUserPermissionsErrors( 'delete', $user );
@@ -1657,7 +1658,9 @@ class Article implements Page {
 		}
 
 		# Better double-check that it hasn't been deleted yet!
-		$this->mPage->loadPageData( 'fromdbmaster' );
+		$this->mPage->loadPageData(
+			$request->wasPosted() ? WikiPage::READ_LATEST : WikiPage::READ_NORMAL
+		);
 		if ( !$this->mPage->exists() ) {
 			$deleteLogPage = new LogPage( 'delete' );
 			$outputPage = $context->getOutput();
@@ -1677,7 +1680,6 @@ class Article implements Page {
 			return;
 		}
 
-		$request = $context->getRequest();
 		$deleteReasonList = $request->getText( 'wpDeleteReasonList', 'other' );
 		$deleteReason = $request->getText( 'wpReason' );