aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/entities.php
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-02 17:33:40 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-02 17:33:40 +0000
commitffa39470d8513396e33f56e018cba22b35419dfc (patch)
tree3e37d8bcd177aec434104b24f7102adcbd8452a7 /engine/lib/entities.php
parentf2428a552af0a11c024c9f22ae0067b02c6734db (diff)
downloadelgg-ffa39470d8513396e33f56e018cba22b35419dfc.tar.gz
elgg-ffa39470d8513396e33f56e018cba22b35419dfc.tar.bz2
Assorted entity fixes
git-svn-id: https://code.elgg.org/elgg/trunk@376 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/entities.php')
-rw-r--r--engine/lib/entities.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index d922a28ce..7bcc9f04e 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -532,7 +532,6 @@
{
if (!($row instanceof stdClass))
return $row;
-
// See if there are any registered subtype handler classes for this type and subtype
$classname = get_subtype_class($row->type, $row->subtype);
if ($classname!="")
@@ -609,7 +608,8 @@
$query .= " $w and ";
$query .= " (access_id in {$access} or (access_id = 0 and owner_guid = {$_SESSION['guid']}))"; // Add access controls
$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
- return get_data($query, "entity_row_to_elggstar");
+ $dt = get_data($query, "entity_row_to_elggstar");
+ return $dt;
}
/**