diff options
author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-25 14:46:05 +0000 |
---|---|---|
committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-06-25 14:46:05 +0000 |
commit | 223e5d08b3333dc93519676580b6d892ff7e19c3 (patch) | |
tree | 4a10b29e1dbe7a7493c3d7cbfeef9a652c3e1ea8 /engine/lib/annotations.php | |
parent | 27009477e3f523721eacc784598a616bf438d772 (diff) | |
download | elgg-223e5d08b3333dc93519676580b6d892ff7e19c3.tar.gz elgg-223e5d08b3333dc93519676580b6d892ff7e19c3.tar.bz2 |
Fixes #87 & #88
git-svn-id: https://code.elgg.org/elgg/trunk@1125 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/annotations.php')
-rw-r--r-- | engine/lib/annotations.php | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php index 97ccb6772..8ae9a9340 100644 --- a/engine/lib/annotations.php +++ b/engine/lib/annotations.php @@ -176,7 +176,17 @@ system_log($entity, 'annotate');
// If ok then add it
- return insert_data("INSERT into {$CONFIG->dbprefix}annotations (entity_guid, name_id, value_id, value_type, owner_guid, time_created, access_id) VALUES ($entity_guid,'$name',$value,'$value_type', $owner_guid, $time, $access_id)");
+ $result = insert_data("INSERT into {$CONFIG->dbprefix}annotations (entity_guid, name_id, value_id, value_type, owner_guid, time_created, access_id) VALUES ($entity_guid,'$name',$value,'$value_type', $owner_guid, $time, $access_id)"); + if ($result!==false) { + $obj = get_annotation($result); + if (trigger_elgg_event('create', $name, $obj)) { + return true; + } else { + delete_annotation($result); + } + } + + return $result;
}
/**
@@ -213,7 +223,17 @@ if (!$name) return false;
// If ok then add it
- return update_data("UPDATE {$CONFIG->dbprefix}annotations set value_id='$value', value_type='$value_type', access_id=$access_id, owner_guid=$owner_guid where id=$annotation_id and name_id='$name' and $access");
+ $result = update_data("UPDATE {$CONFIG->dbprefix}annotations set value_id='$value', value_type='$value_type', access_id=$access_id, owner_guid=$owner_guid where id=$annotation_id and name_id='$name' and $access"); + if ($result!==false) { + $obj = get_annotation($annotation_id); + if (trigger_elgg_event('update', $name, $obj)) { + return true; + } else { + delete_annotation($annotation_id); + } + } + + return $result;
}
/**
|