From: Michael McAndrew <michaelmcandrew@thirdsectordesign.org>
Date: Mon, 23 Apr 2018 11:01:55 +0000 (+0100)
Subject: always remove entity from civicrm_managed if we think it should be deleted
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7f096a9b6e5ee6b354d6187b04e2deb64753cfe2;p=civicrm-core.git

always remove entity from civicrm_managed if we think it should be deleted
---

diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php
index 5021859b01..1e55562c90 100644
--- a/CRM/Core/ManagedEntities.php
+++ b/CRM/Core/ManagedEntities.php
@@ -340,11 +340,10 @@ class CRM_Core_ManagedEntities {
         if ($result['is_error']) {
           $this->onApiError($dao->entity_type, 'delete', $params, $result);
         }
-
-        CRM_Core_DAO::executeQuery('DELETE FROM civicrm_managed WHERE id = %1', array(
-          1 => array($dao->id, 'Integer'),
-        ));
       }
+      CRM_Core_DAO::executeQuery('DELETE FROM civicrm_managed WHERE id = %1', array(
+        1 => array($dao->id, 'Integer'),
+      ));
     }
   }