From 6792cf23a1114e15346bca7008e8d05ddec7f291 Mon Sep 17 00:00:00 2001 From: Jakub-Fajkus Date: Fri, 18 Mar 2022 12:14:44 +0100 Subject: [PATCH] revert --- src/Kdyby/Redis/DI/RedisExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Kdyby/Redis/DI/RedisExtension.php b/src/Kdyby/Redis/DI/RedisExtension.php index 3a8b4cb..c0f1e9e 100644 --- a/src/Kdyby/Redis/DI/RedisExtension.php +++ b/src/Kdyby/Redis/DI/RedisExtension.php @@ -165,7 +165,7 @@ protected function loadSession(array $config): void $clientConfig = $config['clients'][NULL]; - $sessionConfig = \Nette\DI\Config\Helpers::merge([ + $sessionConfig = \Nette\DI\Config\Helpers::merge(\is_array($config['session']) ? $config['session'] : [], [ 'host' => $clientConfig['host'], 'port' => $clientConfig['port'], 'weight' => 1, @@ -179,7 +179,7 @@ protected function loadSession(array $config): void 'connectionAttempts' => $clientConfig['connectionAttempts'], 'persistent' => $clientConfig['persistent'], 'versionCheck' => $clientConfig['versionCheck'], - ], \is_array($config['session']) ? $config['session'] : []); + ]); $sessionConfig['debugger'] = FALSE;