From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 7 Oct 2020 01:05:46 +0000 (+1300)
Subject: dev/core#2039 Call del directly - rather than now-deprecated blockDelete
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4f31fe0315aadc07e93e25b5f73e7c59295b9c8d;p=civicrm-core.git

dev/core#2039 Call del directly - rather than now-deprecated blockDelete

blockDelete is now just wrapper for del so this is really NFC
---

diff --git a/CRM/Core/BAO/Block.php b/CRM/Core/BAO/Block.php
index 10cff14b3f..18725f489b 100644
--- a/CRM/Core/BAO/Block.php
+++ b/CRM/Core/BAO/Block.php
@@ -249,7 +249,7 @@ class CRM_Core_BAO_Block {
         }
       }
     }
-
+    $baoString = 'CRM_Core_BAO_' . $name;
     foreach ($params[$blockName] as $count => $value) {
       if (!is_array($value)) {
         continue;
@@ -289,7 +289,7 @@ class CRM_Core_BAO_Block {
       // $updateBlankLocInfo will help take appropriate decision. CRM-5969
       if (!empty($value['id']) && !$dataExists && $updateBlankLocInfo) {
         //delete the existing record
-        self::blockDelete($blockName, ['id' => $value['id']]);
+        $baoString::del($value['id']);
         continue;
       }
       elseif (!$dataExists) {
@@ -313,7 +313,6 @@ class CRM_Core_BAO_Block {
       }
 
       $blockFields = array_merge($value, $contactFields);
-      $baoString = 'CRM_Core_BAO_' . $name;
       $blocks[] = $baoString::create($blockFields);
     }
 
@@ -322,6 +321,7 @@ class CRM_Core_BAO_Block {
 
   /**
    * Delete block.
+   * @deprecated - just call the BAO / api directly.
    *
    * @param string $blockName
    *   Block name.