From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 25 Jul 2012 10:22:47 +0000 (+0200)
Subject: Use WikiPage::loadPageData() to reload data from the master.
X-Git-Tag: 1.31.0-rc.0~22941^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=73e6b5db378128ff2776d8c38351ea1d6d03fcab;p=lhc%2Fweb%2Fwiklou.git

Use WikiPage::loadPageData() to reload data from the 

There's no need to do this using custom code when we already
have methods for this.

Change-Id: I348dd9a01322b7e9b521e7a014959e91254dd2aa
---

diff --git a/includes/Article.php b/includes/Article.php
index 18ca077402..b8fc09aa59 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1330,10 +1330,8 @@ class Article extends Page {
 		}
 
 		# Better double-check that it hasn't been deleted yet!
-		$dbw = wfGetDB( DB_MASTER );
-		$conds = $title->pageCond();
-		$latest = $dbw->selectField( 'page', 'page_latest', $conds, __METHOD__ );
-		if ( $latest === false ) {
+		$this->mPage->loadPageData( 'fromdbmaster' );
+		if ( !$this->mPage->exists() ) {
 			$outputPage = $this->getContext()->getOutput();
 			$outputPage->setPageTitle( wfMessage( 'cannotdelete-title', $title->getPrefixedText() ) );
 			$outputPage->wrapWikiMsg( "<div class=\"error mw-error-cannotdelete\">\n$1\n</div>",