Delete event now triggered on metadata and annotation delete

git-svn-id: https://code.elgg.org/elgg/trunk@3305 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index 47903616a60454cdefbec06820085786c7e9a5b3..df0f2a043717cf1a874a6b1b61e35d8822ea4955 100644 (file)
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -785,8 +785,12 @@
                $id = (int)$id;\r
                \r
                $access = get_access_sql_suffix();\r
-               \r
-               return delete_data("DELETE from {$CONFIG->dbprefix}annotations  where id=$id and $access");\r
+               $annotation = get_annotation($id);
+               
+               if (trigger_elgg_event('delete', 'annotation', $annotation))\r
+                       return delete_data("DELETE from {$CONFIG->dbprefix}annotations  where id=$id and $access");
+                       
+               return false;\r
        }\r
        \r
        /**\r

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index ca127c3868e33d459e8522816445d17ccede5691..da189fe30594715899325f8f3da0e3a3d03981bf 100644 (file)
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -362,9 +362,10 @@
                        $metabyname_memcache = new ElggMemcache('metabyname_memcache');\r
                if ($metabyname_memcache) $metabyname_memcache->delete("{$metadata->entity_guid}:{$metadata->name_id}");\r
                \r
-               if ($metadata->canEdit())\r
+               if (($metadata->canEdit()) && (trigger_elgg_event('delete', 'metadata', $obj)))\r
                        return delete_data("DELETE from {$CONFIG->dbprefix}metadata where id=$id");\r
-               \r
+               
+               return false;\r
        }\r
        \r
        /**\r