Merge pull request #12309 from jaapjansma/issue_180_deleting_custom_v…

…alues

Fix for #180: passing the entity ID to the custom hook when deleting a custom value

CRM/Core/BAO/CustomValue.php

@@ -207,13 +207,18 @@ public static function deleteCustomValue($customValueID, $customGroupID) {
     // first we need to find custom value table, from custom group ID
     $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupID, 'table_name');
 
+    // Retrieve the $entityId so we can pass that to the hook.
+    $entityID = CRM_Core_DAO::singleValueQuery("SELECT entity_id FROM {$tableName} WHERE id = %1", array(
+      1 => array($customValueID, 'Integer'),
+    ));
+
     // delete custom value from corresponding custom value table
     $sql = "DELETE FROM {$tableName} WHERE id = {$customValueID}";
     CRM_Core_DAO::executeQuery($sql);
 
     CRM_Utils_Hook::custom('delete',
       $customGroupID,
-      NULL,
+      $entityID,
       $customValueID
     );
   }