From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 12 Mar 2019 06:39:29 +0000 (-0700)
Subject: Avoid using outdated $casToken field for BagOStuff calls
X-Git-Tag: 1.34.0-rc.0~2522^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=f474fa4cef3f10acfa38ce825122f44343334133;p=lhc%2Fweb%2Fwiklou.git

Avoid using outdated $casToken field for BagOStuff calls

Change-Id: Ic9bcb388e4f50e2ae16ae57aa16113e79b43350b
---

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index ce7ae1328a..8e8cd98c38 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -189,9 +189,8 @@ class ParserCache {
 		}
 
 		// Determine the options which affect this article
-		$casToken = null;
 		$optionsKey = $this->mMemc->get(
-			$this->getOptionsKey( $article ), $casToken, BagOStuff::READ_VERIFIED );
+			$this->getOptionsKey( $article ), BagOStuff::READ_VERIFIED );
 		if ( $optionsKey instanceof CacheTime ) {
 			if ( $useOutdated < self::USE_EXPIRED && $optionsKey->expired( $article->getTouched() ) ) {
 				$this->incrementStats( $article, "miss.expired" );
@@ -257,7 +256,7 @@ class ParserCache {
 
 		$casToken = null;
 		/** @var ParserOutput $value */
-		$value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
+		$value = $this->mMemc->get( $parserOutputKey, BagOStuff::READ_VERIFIED );
 		if ( !$value ) {
 			wfDebug( "ParserOutput cache miss.\n" );
 			$this->incrementStats( $article, "miss.absent" );