Merge "Update mediawiki/at-ease"

[lhc/web/wiklou.git] / includes / parser / Preprocessor.php

diff --git a/includes/parser/Preprocessor.php b/includes/parser/Preprocessor.php
index cb8e3a7..49e961a 100644 (file)
--- a/includes/parser/Preprocessor.php
+++ b/includes/parser/Preprocessor.php
@@ -62,6 +62,7 @@ abstract class Preprocessor {
         *
         * @param string $text
         * @param int $flags
+        * @param string $tree
         */
        protected function cacheSetTree( $text, $flags, $tree ) {
                $config = RequestContext::getMain()->getConfig();
@@ -69,15 +70,15 @@ abstract class Preprocessor {
                $length = strlen( $text );
                $threshold = $config->get( 'PreprocessorCacheThreshold' );
                if ( $threshold === false || $length < $threshold || $length > 1e6 ) {
-                       return false;
+                       return;
                }
 
-               $key = wfMemcKey(
+               $cache = ObjectCache::getLocalClusterInstance();
+               $key = $cache->makeKey(
                        defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class,
                        md5( $text ), $flags );
                $value = sprintf( "%08d", static::CACHE_VERSION ) . $tree;
 
-               $cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) );
                $cache->set( $key, $value, 86400 );
 
                LoggerFactory::getInstance( 'Preprocessor' )
@@ -101,9 +102,9 @@ abstract class Preprocessor {
                        return false;
                }
 
-               $cache = ObjectCache::getInstance( $config->get( 'MainCacheType' ) );
+               $cache = ObjectCache::getLocalClusterInstance();
 
-               $key = wfMemcKey(
+               $key = $cache->makeKey(
                        defined( 'static::CACHE_PREFIX' ) ? static::CACHE_PREFIX : static::class,
                        md5( $text ), $flags );