From: Max Semenik <maxsem.wiki@gmail.com>
Date: Tue, 23 Feb 2016 01:03:51 +0000 (-0800)
Subject: Fix a PHP 5.5 TODO
X-Git-Tag: 1.31.0-rc.0~7831^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%22id_auteur=%24connect_id_auteur%22%29%20.%20%22?a=commitdiff_plain;h=89710f4ba0941ea20b87e0adc3afe223800ff22e;p=lhc%2Fweb%2Fwiklou.git

Fix a PHP 5.5 TODO

Change-Id: Ieb3bc27e4f33e170b2217ab8eab58f5309083e80
---

diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php
index 255fef8adc..368d79ef49 100644
--- a/includes/parser/Preprocessor.php
+++ b/includes/parser/Preprocessor.php
@@ -67,9 +67,7 @@ abstract class Preprocessor {
 		}
 
 		$key = wfMemcKey(
-			// TODO: Once we require PHP 5.5, use static::class instead of
-			// get_called_class() or get_class( $this ).
-			defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(),
+			defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class,
 			md5( $text ), $flags );
 		$value = sprintf( "%08d", static::CACHE_VERSION ) . $tree;
 
@@ -100,9 +98,7 @@ abstract class Preprocessor {
 		$cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) );
 
 		$key = wfMemcKey(
-			// TODO: Once we require PHP 5.5, use static::class instead of
-			// get_called_class() or get_class( $this ).
-			defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : get_called_class(),
+			defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class,
 			md5( $text ), $flags );
 
 		$value = $cache->get( $key );