From 43828480d83cff68ba2963719858fabc69b2c831 Mon Sep 17 00:00:00 2001 From: icewing Date: Tue, 3 Jun 2008 10:50:45 +0000 Subject: Marcus Povey * Fixed annotations not returning anything * Access control on db now disabled when run from privileged code block. git-svn-id: https://code.elgg.org/elgg/trunk@780 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/relationships.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/lib/relationships.php') diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 0d21793a3..b5d5816a1 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -443,7 +443,7 @@ if ($site_guid == 0) $site_guid = $CONFIG->site_guid; - $access = get_access_list(); + //$access = get_access_list(); $where = array(); @@ -473,7 +473,7 @@ $query .= " from {$CONFIG->dbprefix}entity_relationships r JOIN {$CONFIG->dbprefix}entities e on $joinon where "; foreach ($where as $w) $query .= " $w and "; - $query .= " (e.access_id in {$access} or (e.access_id = 0 and e.owner_guid = {$_SESSION['id']}))"; // Add access controls + $query .= get_access_sql_suffix("e"); // Add access controls if (!$count) { $query .= " order by $order_by limit $offset, $limit"; // Add order and limit return get_data($query, "entity_row_to_elggstar"); -- cgit v1.2.3