From ecd6f2180a5c2d846e15d2205f696f52bce9a575 Mon Sep 17 00:00:00 2001 From: icewing Date: Thu, 3 Apr 2008 10:16:19 +0000 Subject: Marcus Povey * Exception thrown if load fails git-svn-id: https://code.elgg.org/elgg/trunk@389 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/entities.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'engine/lib/entities.php') diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 4a588368d..60ad89733 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -273,8 +273,8 @@ */ protected function load($guid) { - $row = get_entity_as_row($guid); - + $row = get_entity_as_row($guid); + if ($row) { // Create the array if necessary - all subclasses should test before creating @@ -608,7 +608,9 @@ $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 - $dt = get_data($query, "entity_row_to_elggstar"); + + $dt = get_data($query, "entity_row_to_elggstar"); + return $dt; } -- cgit v1.2.3