From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 21 Oct 2015 23:55:10 +0000 (+0100)
Subject: TemplateParser: Use context makeKey() instead of wfMemcKey()
X-Git-Tag: 1.31.0-rc.0~9305^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=f0d53506cf87e06f1b5fdd8760cf3ed6045b6a37;p=lhc%2Fweb%2Fwiklou.git

TemplateParser: Use context makeKey() instead of wfMemcKey()

Also:
* Use ternary shorthand.
* Remove verbose comment about APC fallback. APC always requires
  a fallback and is enforced by the method being called. Stating
  the obvious is confusing here.

Change-Id: Ie5cb3bdc60600806b01b57f1f1b352b981818b0d
---

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 3c62c14002..44d264dec9 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -41,7 +41,7 @@ class TemplateParser {
 	 * @param boolean $forceRecompile
 	 */
 	public function __construct( $templateDir = null, $forceRecompile = false ) {
-		$this->templateDir = $templateDir ? $templateDir : __DIR__ . '/templates';
+		$this->templateDir = $templateDir ?: __DIR__ . '/templates';
 		$this->forceRecompile = $forceRecompile;
 	}
 
@@ -49,7 +49,7 @@ class TemplateParser {
 	 * Constructs the location of the the source Mustache template
 	 * @param string $templateName The name of the template
 	 * @return string
-	 * @throws UnexpectedValueException Disallows upwards directory traversal via $templateName
+	 * @throws UnexpectedValueException If $templateName attempts upwards directory traversal
 	 */
 	protected function getTemplateFilename( $templateName ) {
 		// Prevent upwards directory traversal using same methods as Title::secureAndSplit
@@ -103,10 +103,8 @@ class TemplateParser {
 
 		if ( $secretKey ) {
 			// See if the compiled PHP code is stored in cache.
-			// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
-			// back to CACHE_ANYTHING.
 			$cache = ObjectCache::newAccelerator( CACHE_ANYTHING );
-			$key = wfMemcKey( 'template', $templateName, $fastHash );
+			$key = $cache->makeKey( 'template', $templateName, $fastHash );
 			$code = $this->forceRecompile ? null : $cache->get( $key );
 
 			if ( !$code ) {