Merge pull request #16931 from civicrm/5.24

[civicrm-core.git] / CRM / Core / Transaction.php

diff --git a/CRM/Core/Transaction.php b/CRM/Core/Transaction.php
index b00ce04135fae231224732422ea974e1aacef063..04be629fb36f7ce17b522544cc93b79f8f1cf7fd 100644 (file)
--- a/CRM/Core/Transaction.php
+++ b/CRM/Core/Transaction.php
@@ -236,4 +236,24 @@ class CRM_Core_Transaction {
     $frame->addCallback($phase, $callback, $params, $id);
   }
 
+  /**
+   * Whenever hook_civicrm_post fires, schedule an equivalent
+   * call to hook_civicrm_postCommit.
+   *
+   * @param \Civi\Core\Event\PostEvent $e
+   * @see CRM_Utils_Hook::post
+   */
+  public static function addPostCommit($e) {
+    // Do we want to dedupe post-commit hooks for the same txn? Setting an ID
+    // would allow this.
+    // $id = $e->entity . chr(0) . $e->action . chr(0) . $e->id;
+    $frame = \Civi\Core\Transaction\Manager::singleton()->getBaseFrame();
+    if ($frame) {
+      $frame->addCallback(self::PHASE_POST_COMMIT, ['CRM_Utils_Hook', 'postCommit'], [$e->action, $e->entity, $e->id, $e->object]);
+    }
+    else {
+      \CRM_Utils_Hook::postCommit($e->action, $e->entity, $e->id, $e->object);
+    }
+  }
+
 }