From ba4bbf484d33fe24332ff63ac3b063f346a2a74c Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 8 Oct 2011 21:52:34 -0400 Subject: Fixes #3942 fixed all the warnings and notices in the unit tests --- engine/lib/access.php | 2 +- engine/lib/annotations.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/lib') diff --git a/engine/lib/access.php b/engine/lib/access.php index e8cec50d0..ae64f832a 100644 --- a/engine/lib/access.php +++ b/engine/lib/access.php @@ -460,7 +460,7 @@ function can_edit_access_collection($collection_id, $user_guid = null) { if ($user_guid) { $user = get_entity((int) $user_guid); } else { - $user = get_loggedin_user(); + $user = elgg_get_logged_in_user_entity(); } $collection = get_access_collection($collection_id); diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 814c3555b..c227c5516 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -56,14 +56,14 @@ function elgg_delete_annotation_by_id($id) { * @param int $entity_guid Entity Guid * @param string $name Name of annotation * @param string $value Value of annotation - * @param string $value_type Type of value - * @param int $owner_guid Owner of annotation + * @param string $value_type Type of value (default is auto detection) + * @param int $owner_guid Owner of annotation (default is logged in user) * @param int $access_id Access level of annotation * * @return int|bool id on success or false on failure */ -function create_annotation($entity_guid, $name, $value, $value_type, -$owner_guid, $access_id = ACCESS_PRIVATE) { +function create_annotation($entity_guid, $name, $value, $value_type = '', +$owner_guid = 0, $access_id = ACCESS_PRIVATE) { global $CONFIG; $result = false; -- cgit v1.2.3