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

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index 0370a1e825703cf0749154689817d586176eab27..4a1e4ad0fb1195f0e9e4a73e28ee2706bc11f5bb 100644 (file)
--- 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);