Fixes #1213: delete_relationship() triggers delete:relationship hook.

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

diff --git a/CHANGES.txt b/CHANGES.txt
index e544352ec95dda032b18e8eaed6598b210ee0f8d..43d4cc9ff422f84a4cc918990821afb128c9e2e8 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -40,6 +40,7 @@ http://code.elgg.org/elgg/.....
   * Deprecated search_list*().
   * Added elgg_deprecated_notice().
   * ElggEntity::countEntitiesFromRelationship() supports inverse relationships. #1325
+  * delete_relationship() triggers the hook delete:relationship and passes the relationship object. #1213
 
  Services API:
   * Separated user and api authenticate processing

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index 979d3ea671182f92603b906a592fe90252034e22..789dd45756d07033ce5ec28e8b4beb6f4242cc3d 100644 (file)
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -333,9 +333,13 @@ function delete_relationship($id) {
 
        $id = (int)$id;
 
-       $result = delete_data("delete from {$CONFIG->dbprefix}entity_relationships where id=$id");
+       $relationship = get_relationship($id);
 
-       return $result;
+       if (trigger_elgg_event('delete', 'relationship', $relationship)) {
+               return delete_data("delete from {$CONFIG->dbprefix}entity_relationships where id=$id");
+       }
+
+       return FALSE;
 }
 
 /**