Permalink
Browse files

Merge branch '1.1.x'

  • Loading branch information...
2 parents f8deed9 + 03336c3 commit 36d8f3c2b2c9a893547acf9365b2eca28d52a961 @jmikola jmikola committed Apr 21, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/Doctrine/MongoDB/Connection.php
@@ -81,7 +81,7 @@ public function __construct($server = null, array $options = array(), Configurat
{
if ($server instanceof \MongoClient || $server instanceof \Mongo) {
$this->mongoClient = $server;
- } elseif ($server !== null) {
+ } else {
$this->server = $server;
$this->options = $options;
}

0 comments on commit 36d8f3c

Please sign in to comment.