Merge pull request #22404 from eileenmcnaughton/hooky

Stop calling hook twice
civicrm · Jan 7, 2022 · 4529501 · 4529501
2 parents e9fc27f + 4b1ba25
commit 4529501
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php
@@ -332,12 +332,6 @@ private static function legacyCreateMultiple(&$params, int $contactID) {
     $relationships = $relationshipIds = [];
     $ids = ['contact' => $contactID];
 
-    //CRM-9015 - the hooks are called here & in add (since add doesn't call create)
-    // but in future should be tidied per ticket
-    $hook = 'create';
-    // @todo pre hook is called from add - remove it from here
-    CRM_Utils_Hook::pre($hook, 'Relationship', NULL, $params);
-
     // creating a new relationship
     $dataExists = CRM_Contact_BAO_Relationship::dataExists($params);
     if (!$dataExists) {

diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
@@ -174,11 +174,6 @@ public static function legacyCreateMultiple(&$params, $ids = []) {
     $ids = ['contact' => $ids['contact']];
     // Likewise neither place ever passed in relationshipID
     $relationshipId = NULL;
-    $hook = 'create';
-    // CRM-9015 - the hooks are called here & in add (since add doesn't call create)
-    // but in future should be tidied per ticket
-    // @todo pre hook is called from add - remove it from here
-    CRM_Utils_Hook::pre($hook, 'Relationship', $relationshipId, $params);
 
     if (!$relationshipId) {
       // creating a new relationship