From 82f7909dd08ebfea881d71fd9f2fb1d6ab798932 Mon Sep 17 00:00:00 2001 From: brettp Date: Mon, 14 Feb 2011 02:05:59 +0000 Subject: Fixes #2914. Merged fix for r.time_created sorting to trunk. git-svn-id: http://code.elgg.org/elgg/trunk@8220 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/relationships.php | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'engine') diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 0370a1e82..4a1e4ad0f 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -277,6 +277,16 @@ function elgg_get_entities_from_relationship($options) { } $options['joins'] = array_merge($options['joins'], $clauses['joins']); + + if (isset($options['selects']) && !is_array($options['selects'])) { + $options['selects'] = array($options['selects']); + } elseif (!isset($options['selects'])) { + $options['selects'] = array(); + } + + $select = array('r.*'); + + $options['selects'] = array_merge($options['selects'], $select); } return elgg_get_entities_from_metadata($options); -- cgit v1.2.3