From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Thu, 15 Dec 2016 14:17:56 +0000 (+0100)
Subject: IcuCollation: Add the current class name to 'first-letters' cache key
X-Git-Tag: 1.31.0-rc.0~4559^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/message.php?a=commitdiff_plain;h=611801a38dd2b06b2ef4ccc12f509f00e41c3f08;p=lhc%2Fweb%2Fwiklou.git

IcuCollation: Add the current class name to 'first-letters' cache key

Instances of subclasses of IcuCollation with customizations for
specific languages probably shouldn't share this cache with instances
of IcuCollation with the same language.

Change-Id: I06d66d199c99448a3375381baef0366c4d99c8c4
---

diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php
index 7b4fce6f27..bc5a20967a 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -330,6 +330,7 @@ class IcuCollation extends Collation {
 			$cache = ObjectCache::getLocalServerInstance( CACHE_ANYTHING );
 			$cacheKey = $cache->makeKey(
 				'first-letters',
+				get_class( $this ),
 				$this->locale,
 				$this->digitTransformLanguage->getCode(),
 				self::getICUVersion(),