Apply old PR 367

Closes chrisboulton/php-resque#367
resque · Dec 11, 2018 · 6ff26b9 · 6ff26b9
1 parent 5253e08
commit 6ff26b9
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/lib/Resque/Redis.php b/lib/Resque/Redis.php
@@ -113,12 +113,15 @@ public static function prefix($namespace)
     public function __construct($server, $database = null, $client = null)
 	{
 		try {
-			if (is_array($server)) {
-				$this->driver = new Credis_Cluster($server);
-			}
-			else if (is_object($client)) {
+			if (is_object($client)) {
 				$this->driver = $client;
 			}
+			elseif (is_object($server)) {
+				$this->driver = $server;
+			}
+			elseif (is_array($server)) {
+				$this->driver = new Credis_Cluster($server);
+			}
 			else {
 				list($host, $port, $dsnDatabase, $user, $password, $options) = self::parseDsn($server);
 				// $user is not used, only $password