From 7f0b8463c8e1834c2dd5bef7d0dd34d7d1064d9b Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 13 Jul 2011 19:14:18 +0000 Subject: [PATCH] Added 'fromdbmaster' param option to WikiPage::loadPageData() --- includes/WikiPage.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/includes/WikiPage.php b/includes/WikiPage.php index 61bda70b2f..1d7f2fae70 100644 --- a/includes/WikiPage.php +++ b/includes/WikiPage.php @@ -336,12 +336,17 @@ class WikiPage extends Page { * Set the general counter, title etc data loaded from * some source. * - * @param $data Object|String $res->fetchObject() object or the string "fromdb" to reload + * @param $data Object|String One of the following: + * A DB query result object or... + * "fromdb" to get from a slave DB or... + * "fromdbmaster" to get from the master DB */ public function loadPageData( $data = 'fromdb' ) { - if ( $data === 'fromdb' ) { - $dbr = wfGetDB( DB_SLAVE ); - $data = $this->pageDataFromTitle( $dbr, $this->mTitle ); + if ( $data === 'fromdb' || $data === 'fromdbmaster' ) { + $db = ( $data == 'fromdbmaster' ) + ? wfGetDB( DB_MASTER ) + : wfGetDB( DB_SLAVE ); + $data = $this->pageDataFromTitle( $db, $this->mTitle ); } $lc = LinkCache::singleton(); -- 2.20.1