Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch '1.0.x' into 1.1.x

Conflicts:
	lib/Doctrine/MongoDB/Collection.php
  • Loading branch information...
commit 36043360d596e1caa97342c2136ff8c26a5034aa 2 parents 04a0d24 + 2d9053c
@jmikola jmikola authored
Showing with 1 addition and 0 deletions.
  1. +1 −0  lib/Doctrine/MongoDB/Collection.php
View
1  lib/Doctrine/MongoDB/Collection.php
@@ -280,6 +280,7 @@ public function drop()
*/
public function ensureIndex(array $keys, array $options = array())
{
+ $options = isset($options['safe']) ? $this->convertWriteConcern($options) : $options;
return $this->mongoCollection->ensureIndex($keys, $options);
}
Please sign in to comment.
Something went wrong with that request. Please try again.