Skip to content

Commit 6ff26b9

Browse files
committed
Apply old PR 367
Closes chrisboulton/php-resque#367
1 parent 5253e08 commit 6ff26b9

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

lib/Resque/Redis.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,15 @@ public static function prefix($namespace)
113113
public function __construct($server, $database = null, $client = null)
114114
{
115115
try {
116-
if (is_array($server)) {
117-
$this->driver = new Credis_Cluster($server);
118-
}
119-
else if (is_object($client)) {
116+
if (is_object($client)) {
120117
$this->driver = $client;
121118
}
119+
elseif (is_object($server)) {
120+
$this->driver = $server;
121+
}
122+
elseif (is_array($server)) {
123+
$this->driver = new Credis_Cluster($server);
124+
}
122125
else {
123126
list($host, $port, $dsnDatabase, $user, $password, $options) = self::parseDsn($server);
124127
// $user is not used, only $password

0 commit comments

Comments
 (0)