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

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 18ca077..b8fc09a 100644 (file)
--- 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>",