diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
| commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
| tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/utils/MWCryptHKDF.php | |
| parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) | |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/utils/MWCryptHKDF.php')
| -rw-r--r-- | includes/utils/MWCryptHKDF.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/includes/utils/MWCryptHKDF.php b/includes/utils/MWCryptHKDF.php index 950dd846..740df922 100644 --- a/includes/utils/MWCryptHKDF.php +++ b/includes/utils/MWCryptHKDF.php @@ -161,7 +161,7 @@ class MWCryptHKDF { * @throws MWException */ protected static function singleton() { - global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey; + global $wgHKDFAlgorithm, $wgHKDFSecret, $wgSecretKey, $wgMainCacheType; $secret = $wgHKDFSecret ?: $wgSecretKey; if ( !$secret ) { @@ -176,11 +176,7 @@ class MWCryptHKDF { $context[] = gethostname(); // Setup salt cache. Use APC, or fallback to the main cache if it isn't setup - try { - $cache = ObjectCache::newAccelerator( array() ); - } catch ( Exception $e ) { - $cache = wfGetMainCache(); - } + $cache = ObjectCache::newAccelerator( $wgMainCacheType ); if ( is_null( self::$singleton ) ) { self::$singleton = new self( $secret, $wgHKDFAlgorithm, $cache, $context ); |