jenkins-bot has submitted this change and it was merged.
Change subject: Make DateFormatter::getInstance use APC
......................................................................
Make DateFormatter::getInstance use APC
Change-Id: Idfff805903bffcdd6ff8f2a3c1331ca63476933e
---
M includes/parser/DateFormatter.php
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/parser/DateFormatter.php
b/includes/parser/DateFormatter.php
index ef295ab..78f7775 100644
--- a/includes/parser/DateFormatter.php
+++ b/includes/parser/DateFormatter.php
@@ -124,18 +124,23 @@
* Defaults to the site content language
* @return DateFormatter
*/
- public static function &getInstance( $lang = null ) {
- global $wgMemc, $wgContLang;
- static $dateFormatter = false;
+ public static function getInstance( $lang = null ) {
+ global $wgContLang, $wgMainCacheType;
+
$lang = $lang ? wfGetLangObj( $lang ) : $wgContLang;
- $key = wfMemcKey( 'dateformatter', $lang->getCode() );
+ $cache = ObjectCache::newAccelerator( $wgMainCacheType );
+
+ static $dateFormatter = false;
if ( !$dateFormatter ) {
- $dateFormatter = $wgMemc->get( $key );
- if ( !$dateFormatter ) {
- $dateFormatter = new DateFormatter( $lang );
- $wgMemc->set( $key, $dateFormatter, 3600 );
- }
+ $dateFormatter = $cache->getWithSetCallback(
+ $cache->makeKey( 'dateformatter',
$lang->getCode() ),
+ 3600,
+ function () use ( $lang ) {
+ return new DateFormatter( $lang );
+ }
+ );
}
+
return $dateFormatter;
}
--
To view, visit https://gerrit.wikimedia.org/r/248816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfff805903bffcdd6ff8f2a3c1331ca63476933e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
