From 89710f4ba0941ea20b87e0adc3afe223800ff22e Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Mon, 22 Feb 2016 17:03:51 -0800 Subject: [PATCH] Fix a PHP 5.5 TODO Change-Id: Ieb3bc27e4f33e170b2217ab8eab58f5309083e80 --- includes/parser/Preprocessor.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 ); -- 2.20.1