aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-11-09 20:43:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-11-09 20:43:05 +0000
commitf803e43dbb0d81c29ad47ddab850cd4a637eb975 (patch)
tree93ffde2b82f23307c5f23bc4c626fe95a0b39377 /engine
parent2ca5970ab76e5f36a25a9f83e68a1e1c09da0ecf (diff)
downloadelgg-f803e43dbb0d81c29ad47ddab850cd4a637eb975.tar.gz
elgg-f803e43dbb0d81c29ad47ddab850cd4a637eb975.tar.bz2
Ignoring empty owner_guids in elgg_get_entities.
git-svn-id: http://code.elgg.org/elgg/trunk@3644 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/entities.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 0afe30a6e..0fa08de58 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1769,6 +1769,7 @@ function elgg_get_entities(array $options = array()) {
$offset = sanitise_int($options['offset']);
$query .= " LIMIT $offset, $limit";
}
+
$dt = get_data($query, "entity_row_to_elggstar");
//@todo normalize this to array()
@@ -2009,7 +2010,7 @@ function elgg_get_entity_owner_where_sql($table, $owner_guids) {
$where = '';
// implode(',', 0) returns 0.
- if (FALSE !== $owner_str = implode(',', $owner_guids_sanitised)) {
+ if (($owner_str = implode(',', $owner_guids_sanitised)) && ($owner_str !== FALSE) && ($owner_str !== '')) {
$where = "({$table}.owner_guid IN ($owner_str))";
}