From 83a2f95f8b9c4342d87bcc9c7266c99452dfc927 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Tue, 11 Jan 2011 13:04:55 +0000
Subject: [PATCH] Simplify a bit: * replaced calls to Article::getLatest() by
 Title::getLatestRevID() * introduced Skin::isRevisionCurrent() * made checks
 on Skin::pageStats() more coherent

---
 includes/Skin.php         | 41 +++++++++++++++++----------------------
 includes/SkinTemplate.php |  8 ++++----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/includes/Skin.php b/includes/Skin.php
index c88e8a0ebb..d0da97c162 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -354,6 +354,15 @@ class Skin extends Linker {
 		$this->usercss = false;
 	}
 
+	/**
+	 * Whether the revision displayed is the latest revision of the page
+	 *
+	 * @return Boolean
+	 */
+	public function isRevisionCurrent() {
+		return $this->mRevisionId == 0 || $this->mRevisionId != $this->mTitle->getLatestRevID();
+	}
+
 	/**
 	 * Set the title
 	 * @param $t Title object to use
@@ -484,7 +493,7 @@ class Skin extends Linker {
 	 * You will only be adding bloat to the page and causing page caches to have to be purged on configuration changes.
 	 */
 	static function makeGlobalVariablesScript( $skinName ) {
-		global $wgTitle, $wgUser, $wgRequest, $wgArticle, $wgOut, $wgUseAjax, $wgEnableMWSuggest;
+		global $wgTitle, $wgUser, $wgRequest, $wgOut, $wgUseAjax, $wgEnableMWSuggest;
 		
 		$ns = $wgTitle->getNamespace();
 		$nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();
@@ -500,7 +509,7 @@ class Skin extends Linker {
 			'wgIsArticle' => $wgOut->isArticle(),
 			'wgUserName' => $wgUser->isAnon() ? null : $wgUser->getName(),
 			'wgUserGroups' => $wgUser->getEffectiveGroups(),
-			'wgCurRevisionId' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
+			'wgCurRevisionId' => $wgTitle->getLatestRevID(),
 			'wgCategories' => $wgOut->getCategories(),
 			'wgBreakFrames' => $wgOut->getFrameOptions() == 'DENY',
 		);
@@ -1473,22 +1482,11 @@ class Skin extends Linker {
 		global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
 		global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgPageShowWatchingUsers;
 
-		$oldid = $wgRequest->getVal( 'oldid' );
-		$diff = $wgRequest->getVal( 'diff' );
-
-		if ( !$wgOut->isArticle() ) {
+		if ( !is_null( $wgRequest->getVal( 'oldid' ) ) || !is_null( $wgRequest->getVal( 'diff' ) ) ) {
 			return '';
 		}
 
-		if ( !$wgArticle instanceof Article ) {
-			return '';
-		}
-
-		if ( isset( $oldid ) || isset( $diff ) ) {
-			return '';
-		}
-
-		if ( 0 == $wgArticle->getID() ) {
+		if ( !$wgOut->isArticle() || !$this->mTitle->exists() ) {
 			return '';
 		}
 
@@ -1530,13 +1528,12 @@ class Skin extends Linker {
 	}
 
 	function getCopyright( $type = 'detect' ) {
-		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest, $wgArticle;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
 
 		if ( $type == 'detect' ) {
 			$diff = $wgRequest->getVal( 'diff' );
-			$isCur = $wgArticle && $wgArticle->isCurrent();
 
-			if ( is_null( $diff ) && !$isCur && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+			if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
 				$type = 'history';
 			} else {
 				$type = 'normal';
@@ -1619,8 +1616,8 @@ class Skin extends Linker {
 	function lastModified() {
 		global $wgLang, $wgArticle;
 
-		if ( $this->mRevisionId && $this->mRevisionId != $wgArticle->getLatest() ) {
-			$timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
+		if ( !$this->isRevisionCurrent() ) {
+			$timestamp = Revision::getTimestampFromId( $this->mTitle, $this->mRevisionId );
 		} else {
 			$timestamp = $wgArticle->getTimestamp();
 		}
@@ -1803,11 +1800,9 @@ class Skin extends Linker {
 	 * @private
 	 */
 	function editUrlOptions() {
-		global $wgArticle;
-
 		$options = array( 'action' => 'edit' );
 
-		if ( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
+		if ( !$this->isRevisionCurrent() ) {
 			$options['oldid'] = intval( $this->mRevisionId );
 		}
 
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 9e557abd99..dff507adb1 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -245,7 +245,7 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
 		$tpl->set( 'titletext', $this->mTitle->getText() );
 		$tpl->set( 'articleid', $this->mTitle->getArticleId() );
-		$tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
+		$tpl->set( 'currevisionid', $this->mTitle->getLatestRevID() );
 
 		$tpl->set( 'isarticle', $out->isArticle() );
 
@@ -345,7 +345,7 @@ class SkinTemplate extends Skin {
 		$tpl->setRef( 'skin', $this );
 		$tpl->set( 'logo', $this->logoText() );
 		if ( $out->isArticle() && ( !isset( $oldid ) || isset( $diff ) ) &&
-			$wgArticle && 0 != $wgArticle->getID() ){
+			$this->mTitle->exists() ){
 			if ( !$wgDisableCounters ) {
 				$viewcount = $wgLang->formatNum( $wgArticle->getCount() );
 				if ( $viewcount ) {
@@ -784,7 +784,7 @@ class SkinTemplate extends Skin {
 	 * @private
 	 */
 	function buildContentNavigationUrls() {
-		global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+		global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
 		global $wgDisableLangConversion;
 
 		wfProfileIn( __METHOD__ );
@@ -879,7 +879,7 @@ class SkinTemplate extends Skin {
 				);
 				// Checks if this is a current rev of talk page and we should show a new
 				// section link
-				if ( ( $isTalk && $wgArticle && $wgArticle->isCurrent() ) || ( $wgOut->showNewSectionLink() ) ) {
+				if ( ( $isTalk && $this->isRevisionCurrent() ) || ( $wgOut->showNewSectionLink() ) ) {
 					// Checks if we should ever show a new section link
 					if ( !$wgOut->forceHideNewSectionLink() ) {
 						// Adds new section link
-- 
2.20.1