RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

[DDC-551] Keep filter parameters and enabled filters sorted for hashing

Browse source
This commit is contained in:
Alexander 2011-07-22 14:20:36 +02:00
parent 277fc751b6
commit d1908f7207
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/EntityManager.php
View file

@ -763,6 +763,9 @@ class EntityManager implements ObjectManager
if(!isset($this->enabledFilters[$name])) { if(!isset($this->enabledFilters[$name])) {
$this->enabledFilters[$name] = new $filterClass($this->conn); $this->enabledFilters[$name] = new $filterClass($this->conn);
// Keep the enabled filters sorted for the hash
ksort($this->enabledFilters);
} }
return $this->enabledFilters[$name]; return $this->enabledFilters[$name];

3
lib/Doctrine/ORM/Query/Filter/SQLFilter.php
View file

@ -47,6 +47,9 @@ abstract class SQLFilter
// @todo: check for a valid type? // @todo: check for a valid type?
$this->parameters[$name] = array('value' => $value, 'type' => $type); $this->parameters[$name] = array('value' => $value, 'type' => $type);
// Keep the parameters sorted for the hash
ksort($this->parameters);
return $this; return $this;
} }