Slightly rework original pull request.

This commit is contained in:
Daniele Alessandri
2013-05-31 10:17:54 +02:00
parent 8451146d38
commit dd50cfe47e
+6 -4
View File
@@ -21,7 +21,6 @@ use Predis\ClientInterface;
*/
class DispatcherLoop
{
private $client;
private $pubSubContext;
private $callbacks;
private $defaultCallback;
@@ -33,7 +32,6 @@ class DispatcherLoop
public function __construct(ClientInterface $client)
{
$this->callbacks = array();
$this->client = $client;
$this->pubSubContext = $client->pubSub();
}
@@ -160,8 +158,12 @@ class DispatcherLoop
*/
protected function getPrefixKeys()
{
$prefix = $this->client->getOptions()->prefix;
$options = $this->pubSubContext->getClient()->getOptions();
return $prefix ? $prefix->getPrefix() : '';
if (isset($options->prefix)) {
return $options->prefix->getPrefix();
}
return '';
}
}