aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/entities.php
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-09-28 22:05:31 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-09-28 22:05:31 -0700
commit90f5e694f6e7005f35297f9493f5caeedcf25a8c (patch)
tree26d960c24368e3cf212be08eaa2f27f843025872 /engine/lib/entities.php
parent700ae307bd2bc698f60ffd02afcc87aaff9f74e5 (diff)
downloadelgg-90f5e694f6e7005f35297f9493f5caeedcf25a8c.tar.gz
elgg-90f5e694f6e7005f35297f9493f5caeedcf25a8c.tar.bz2
Fixes #3713. elgg_get_entities() and friends return false if passed invalid options.
Diffstat (limited to 'engine/lib/entities.php')
-rw-r--r--engine/lib/entities.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index cea8af1da..abf7395e7 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -846,9 +846,6 @@ function elgg_get_entities(array $options = array()) {
$wheres[] = elgg_get_entity_time_where_sql('e', $options['created_time_upper'],
$options['created_time_lower'], $options['modified_time_upper'], $options['modified_time_lower']);
- // remove identical where clauses
- $wheres = array_unique($wheres);
-
// see if any functions failed
// remove empty strings on successful functions
foreach ($wheres as $i => $where) {
@@ -859,6 +856,9 @@ function elgg_get_entities(array $options = array()) {
}
}
+ // remove identical where clauses
+ $wheres = array_unique($wheres);
+
// evaluate join clauses
if (!is_array($options['joins'])) {
$options['joins'] = array($options['joins']);