Commit 4d9e6d91 authored by Karamel's avatar Karamel
Browse files

Fix previous commit.

parent 912e57c3
......@@ -63,7 +63,7 @@ class DoctrineDAO implements DAO
'driver' => $driver,
'charset'=> 'utf8');
$setup = Setup::createAnnotationMetadataConfiguration($path, $isDevMode,
__DIR__ . '/../../../generated/');
__DIR__ . '/../../../generated/');
$this->em = EntityManager::create($dbParams, $setup);
$this->roEm = EntityManager::create($dbParams, $setup);
......@@ -185,7 +185,7 @@ class DoctrineDAO implements DAO
public function search($modelName, $conditions = null,
$count = null, $offset = null, $order = null) {
$criteria = $this->getCriteria(null, $count, $offset, $order);
$criteria = $this->getCriteria($conditions, $count, $offset, $order);
return $this->em->getRepository($modelName)->matching($criteria)->getValues();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment