From: Aaron <aschulz@wikimedia.org>
Date: Mon, 27 Aug 2012 23:20:56 +0000 (-0700)
Subject: Reduced some master queries via Revision::READ_NORMAL.
X-Git-Tag: 1.31.0-rc.0~22555^2
X-Git-Url: http://git.cyclocoop.org/%27%20.%20url_absolue%28%24favicon%29%20.%20?a=commitdiff_plain;h=d1ea6352e6e6056794e88f45bc0428881794428e;p=lhc%2Fweb%2Fwiklou.git

Reduced some master queries via Revision::READ_NORMAL.

* Also normalized 0 => false for the rev ID parameter in some places.
* Broke some long lines and shorted a variable name in Skin.php.

Change-Id: I6645315699ec7670ae22aa1dbf787d75d6e6b7ec
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 5af6aec660..5501d32eb4 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1352,18 +1352,19 @@ abstract class Skin extends ContextSource {
 		$ntl = '';
 
 		if ( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-			$userTalkTitle = $this->getUser()->getTalkPage();
+			$uTalkTitle = $this->getUser()->getTalkPage();
 
-			if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
+			if ( !$uTalkTitle->equals( $out->getTitle() ) ) {
 				$lastSeenRev = isset( $newtalks[0]['rev'] ) ? $newtalks[0]['rev'] : null;
 				$nofAuthors = 0;
 				if ( $lastSeenRev !== null ) {
 					$plural = true; // Default if we have a last seen revision: if unknown, use plural
-					$latestRev = Revision::newFromTitle ($userTalkTitle);
+					$latestRev = Revision::newFromTitle( $uTalkTitle, false, Revision::READ_NORMAL );
 					if ( $latestRev !== null ) {
 						// Singular if only 1 unseen revision, plural if several unseen revisions.
 						$plural = $latestRev->getParentId() !== $lastSeenRev->getId();
-						$nofAuthors = $userTalkTitle->countAuthorsBetween( $lastSeenRev, $latestRev, 10, 'include_new' );
+						$nofAuthors = $uTalkTitle->countAuthorsBetween(
+							$lastSeenRev, $latestRev, 10, 'include_new' );
 					}
 				} else {
 					// Singular if no revision -> diff link will show latest change only in any case
@@ -1374,14 +1375,14 @@ abstract class Skin extends ContextSource {
 				// the number of revisions or authors is not necessarily the same as the number of
 				// "messages".
 				$newMessagesLink = Linker::linkKnown(
-					$userTalkTitle,
+					$uTalkTitle,
 					$this->msg( 'newmessageslinkplural' )->params( $plural )->escaped(),
 					array(),
 					array( 'redirect' => 'no' )
 				);
 
 				$newMessagesDiffLink = Linker::linkKnown(
-					$userTalkTitle,
+					$uTalkTitle,
 					$this->msg( 'newmessagesdifflinkplural' )->params( $plural )->escaped(),
 					array(),
 					$lastSeenRev !== null
diff --git a/includes/job/RefreshLinksJob.php b/includes/job/RefreshLinksJob.php
index 6b8dede820..b23951c6f5 100644
--- a/includes/job/RefreshLinksJob.php
+++ b/includes/job/RefreshLinksJob.php
@@ -55,7 +55,7 @@ class RefreshLinksJob extends Job {
 			wfGetLB()->waitFor( $this->params['masterPos'] );
 		}
 
-		$revision = Revision::newFromTitle( $this->title, 0, Revision::READ_NORMAL );
+		$revision = Revision::newFromTitle( $this->title, false, Revision::READ_NORMAL );
 		if ( !$revision ) {
 			$this->error = 'refreshLinks: Article not found "' .
 				$this->title->getPrefixedDBkey() . '"';
@@ -185,7 +185,7 @@ class RefreshLinksJob2 extends Job {
 			}
 			# Re-parse each page that transcludes this page and update their tracking links...
 			foreach ( $titles as $title ) {
-				$revision = Revision::newFromTitle( $title, 0, Revision::READ_NORMAL );
+				$revision = Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 				if ( !$revision ) {
 					$this->error = 'refreshLinks: Article not found "' .
 						$title->getPrefixedDBkey() . '"';
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 4c6a22f740..237c0a7bc5 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -660,7 +660,7 @@ class CoreParserFunctions {
 		if( isset( $cache[$page] ) ) {
 			$length = $cache[$page];
 		} elseif( $parser->incrementExpensiveFunctionCount() ) {
-			$rev = Revision::newFromTitle( $title );
+			$rev = Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 			$id = $rev ? $rev->getPage() : 0;
 			$length = $cache[$page] = $rev ? $rev->getSize() : 0;
 
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 5f211b183b..8e9444a2bd 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3565,7 +3565,7 @@ class Parser {
 			# Get the revision
 			$rev = $id
 				? Revision::newFromId( $id )
-				: Revision::newFromTitle( $title, 0, Revision::READ_NORMAL );
+				: Revision::newFromTitle( $title, false, Revision::READ_NORMAL );
 			$rev_id = $rev ? $rev->getId() : 0;
 			# If there is no current revision, there is no page
 			if ( $id === false && !$rev ) {