From: umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 2 Feb 2016 19:38:36 +0000 (+0100)
Subject: Pass WikiPage objects to ParserCache
X-Git-Tag: 1.31.0-rc.0~8103^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=097b8ce76f59e2405f01fd573d05e29e36a39ba3;p=lhc%2Fweb%2Fwiklou.git

Pass WikiPage objects to ParserCache

ParserCache::get is documented for WikiPage, so do it from Article class
This avoids magic calls due Article::__call

Change-Id: I92b91bd112383d1c0132530c3325b39596d95768
---

diff --git a/includes/page/Article.php b/includes/page/Article.php
index f16158b875..f67ebcc9cc 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -521,7 +521,7 @@ class Article implements Page {
 		# Try client and file cache
 		if ( !$wgDebugToolbar && $oldid === 0 && $this->mPage->checkTouched() ) {
 			if ( $wgUseETag ) {
-				$outputPage->setETag( $parserCache->getETag( $this, $parserOptions ) );
+				$outputPage->setETag( $parserCache->getETag( $this->mPage, $parserOptions ) );
 			}
 
 			# Use the greatest of the page's timestamp or the timestamp of any
@@ -595,7 +595,7 @@ class Article implements Page {
 
 					# Try the parser cache
 					if ( $useParserCache ) {
-						$this->mParserOutput = $parserCache->get( $this, $parserOptions );
+						$this->mParserOutput = $parserCache->get( $this->mPage, $parserOptions );
 
 						if ( $this->mParserOutput !== false ) {
 							if ( $oldid ) {