Merge pull request #117 from Jakub-Fajkus/fix-ci-build

revert
Kdyby · Mar 18, 2022 · 24344e4 · 24344e4
2 parents c35445f + 6792cf2
commit 24344e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;