X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2Flockmanager%2FRedisLockManager.php;h=a624f0a971000ea302cd262211241e1ed977876d;hb=33ac4182cae78d525d5fabd317d5889f52c46135;hp=ea9dde7f2a09ae5023d246c465792197ff448116;hpb=1d95c68977ef49738eb0fc9c3701afe06467fbeb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/lockmanager/RedisLockManager.php b/includes/libs/lockmanager/RedisLockManager.php
index ea9dde7f2a..a624f0a971 100644
--- a/includes/libs/lockmanager/RedisLockManager.php
+++ b/includes/libs/lockmanager/RedisLockManager.php
@@ -76,7 +76,7 @@ class RedisLockManager extends QuorumLockManager {
 	protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
 		$status = StatusValue::newGood();
 
-		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+		$pathList = array_merge( ...array_values( $pathsByType ) );
 
 		$server = $this->lockServers[$lockSrv];
 		$conn = $this->redisPool->getConnection( $server, $this->logger );
@@ -171,7 +171,7 @@ LUA;
 	protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
 		$status = StatusValue::newGood();
 
-		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+		$pathList = array_merge( ...array_values( $pathsByType ) );
 
 		$server = $this->lockServers[$lockSrv];
 		$conn = $this->redisPool->getConnection( $server, $this->logger );