Merge pull request #23742 from eileenmcnaughton/import_remove

[civicrm-core.git] / CRM / Core / BAO / RecurringEntity.php

diff --git a/CRM/Core/BAO/RecurringEntity.php b/CRM/Core/BAO/RecurringEntity.php
index 750959d45b3ffec4d715b34260f4b8bb1034cdae..8b7da449eed1805ceadd7c5a679b99f906af4b5a 100644 (file)
--- a/CRM/Core/BAO/RecurringEntity.php
+++ b/CRM/Core/BAO/RecurringEntity.php
@@ -588,15 +588,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity implemen
    *   An object of /Civi/Core/DAO/Event/PostUpdate containing dao object that was just updated.
    */
   public static function triggerUpdate($event) {
-    // if DB version is earlier than 4.6 skip any processing
-    static $currentVer = NULL;
-    if (!$currentVer) {
-      $currentVer = CRM_Core_BAO_Domain::version();
-    }
-    if (version_compare($currentVer, '4.6.alpha1') < 0) {
-      return;
-    }
-
     static $processedEntities = [];
     $obj =& $event->object;
     if (empty($obj->id) || empty($obj->__table)) {
@@ -661,15 +652,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity implemen
       return;
     }
 
-    // if DB version is earlier than 4.6 skip any processing
-    static $currentVer = NULL;
-    if (!$currentVer) {
-      $currentVer = CRM_Core_BAO_Domain::version();
-    }
-    if (version_compare($currentVer, '4.6.alpha1') < 0) {
-      return;
-    }
-
     static $processedEntities = [];
     if (empty($obj->id) || empty($obj->__table)) {
       return;
@@ -765,15 +747,6 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity implemen
   public static function triggerDelete($event) {
     $obj =& $event->object;
 
-    // if DB version is earlier than 4.6 skip any processing
-    static $currentVer = NULL;
-    if (!$currentVer) {
-      $currentVer = CRM_Core_BAO_Domain::version();
-    }
-    if (version_compare($currentVer, '4.6.alpha1') < 0) {
-      return;
-    }
-
     static $processedEntities = [];
     if (empty($obj->id) || empty($obj->__table) || !$event->result) {
       return;
@@ -1138,7 +1111,7 @@ class CRM_Core_BAO_RecurringEntity extends CRM_Core_DAO_RecurringEntity implemen
         $dao = self::$_tableDAOMapper[$linkedEntityTable];
       }
       else {
-        CRM_Core_Session::setStatus('Could not update mode for linked entities');
+        CRM_Core_Session::setStatus(ts('Could not update mode for linked entities'));
         return NULL;
       }
       $entityTable = $linkedEntityTable;