Merge branch '1.0.x' into 1.1.x

jmikola · jmikola · commit 03336c3ead38 · 2014-04-21T16:23:18.000-04:00
Conflicts:
	lib/Doctrine/MongoDB/Connection.php
diff --git a/lib/Doctrine/MongoDB/Connection.php b/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;
         }

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function __construct($server = null, array $options = array(), Configurat`
`81`	`81`	`{`
`82`	`82`	`if ($server instanceof \MongoClient \|\| $server instanceof \Mongo) {`
`83`	`83`	`$this->mongoClient = $server;`
`84`		`- } elseif ($server !== null) {`
	`84`	`+ } else {`
`85`	`85`	`$this->server = $server;`
`86`	`86`	`$this->options = $options;`
`87`	`87`	`}`