From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 22 May 2019 16:30:50 +0000 (-0700)
Subject: objectcache: make detectLocalServerCache() prefer apcu over apc
X-Git-Tag: 1.34.0-rc.0~1618^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=e7427010916608f3b67f0c385f44e5f45048b11b;p=lhc%2Fweb%2Fwiklou.git

objectcache: make detectLocalServerCache() prefer apcu over apc

Bug: T220470
Change-Id: I8b85859b3991d2360a74107299d44da2c60d0214
---

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index bc87c70b0f..c0adb51860 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -400,10 +400,10 @@ class ObjectCache {
 	 * @return int|string Index to cache in $wgObjectCaches
 	 */
 	public static function detectLocalServerCache() {
-		if ( function_exists( 'apc_fetch' ) ) {
-			return 'apc';
-		} elseif ( function_exists( 'apcu_fetch' ) ) {
+		if ( function_exists( 'apcu_fetch' ) ) {
 			return 'apcu';
+		} elseif ( function_exists( 'apc_fetch' ) ) {
+			return 'apc';
 		} elseif ( function_exists( 'wincache_ucache_get' ) ) {
 			return 'wincache';
 		}