From eae8e62e5ec600f3bec23327c43da046558d1fb3 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 18 Jan 2022 16:24:24 +0100
Subject: [PATCH] fix: [CRUD] delete post message fix

- correct order of execution for the beforesave command
---
 src/Controller/Component/CRUDComponent.php | 24 ++++++++--------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/Controller/Component/CRUDComponent.php b/src/Controller/Component/CRUDComponent.php
index 0adfcdf..d1c78fc 100644
--- a/src/Controller/Component/CRUDComponent.php
+++ b/src/Controller/Component/CRUDComponent.php
@@ -467,24 +467,18 @@ class CRUDComponent extends Component
                 if (!empty($params['contain'])) {
                     $data->contain($params['contain']);
                 }
+                $data = $data->first();
                 if (isset($params['beforeSave'])) {
                     $data = $params['beforeSave']($data);
-                    if ($data === false) {
-                        $skipExecution = true;
-                        $success = false;
-                    }
                 }
-                if (!$skipExecution) {
-                    $data = $data->first();
-                    if (!empty($data)) {
-                        $success = $this->Table->delete($data);
-                        $success = true;
-                    } else {
-                        $success = false;
-                    }
-                    if ($success) {
-                        $bulkSuccesses++;
-                    }
+                if (!empty($data)) {
+                    $success = $this->Table->delete($data);
+                    $success = true;
+                } else {
+                    $success = false;
+                }
+                if ($success) {
+                    $bulkSuccesses++;
                 }
             }
             $message = $this->getMessageBasedOnResult(