Commit 413067ad authored by Eric Schultz's avatar Eric Schultz
Browse files

Made Mongo Mapper select fixes safe for php 5.3

parent 8c9f2203

db/mongo/mapper.php

+10 −9
Original line number Diff line number Diff line
@@ -114,12 +114,7 @@ class Mapper extends \DB\Cursor { 
			$fw->stringify(array($fields,$filter,$options))).'.mongo',

			$result)) || !$ttl || $cached[0]+$ttl<microtime(TRUE)) {

			if ($options['group']) {

				$tmp=$this->db->selectcollection(

					$fw->get('HOST').'.'.$fw->get('BASE').'.'.

					uniqid(NULL,TRUE).'.tmp'

				);

				$tmp->batchinsert(

					$this->collection->group(

				$grp=$this->collection->group(

					$options['group']['keys'],

					$options['group']['initial'],

					$options['group']['reduce'],
@@ -127,7 +122,13 @@ class Mapper extends \DB\Cursor { 
						'condition'=>$filter,

						'finalize'=>$options['group']['finalize']

					)

					)['retval'],

				);

				$tmp=$this->db->selectcollection(

					$fw->get('HOST').'.'.$fw->get('BASE').'.'.

					uniqid(NULL,TRUE).'.tmp'

				);

				$tmp->batchinsert(

					$grp['retval'],

					array('safe'=>TRUE)

				);

				$filter=array();