From 9759ab523c60aefe8a7bedcad14b73a273f407da Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Fri, 28 Apr 2023 14:28:51 +0300
Subject: [PATCH] ref

---
 application/Espo/Hooks/Common/Formula.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/application/Espo/Hooks/Common/Formula.php b/application/Espo/Hooks/Common/Formula.php
index cf7a7efb62..761da7e792 100644
--- a/application/Espo/Hooks/Common/Formula.php
+++ b/application/Espo/Hooks/Common/Formula.php
@@ -31,13 +31,13 @@ namespace Espo\Hooks\Common;
 
 use Espo\ORM\Entity;
 use Espo\ORM\Repository\Option\SaveOptions;
-
 use Espo\Core\Hook\Hook\BeforeSave;
 use Espo\Core\Formula\Manager as FormulaManager;
 use Espo\Core\Utils\Log;
 use Espo\Core\Utils\Metadata;
 
 use Exception;
+use stdClass;
 
 /**
  * @implements BeforeSave<Entity>
@@ -63,12 +63,7 @@ class Formula implements BeforeSave
         $variables = (object) [];
 
         foreach ($scriptList as $script) {
-            try {
-                $this->formulaManager->run($script, $entity, $variables);
-            }
-            catch (Exception $e) {
-                $this->log->error('Before-save formula script failed: ' . $e->getMessage());
-            }
+            $this->runScript($script, $entity, $variables);;
         }
 
         $customScript = $this->metadata->get(['formula', $entity->getEntityType(), 'beforeSaveCustomScript']);
@@ -77,8 +72,13 @@ class Formula implements BeforeSave
             return;
         }
 
+        $this->runScript($customScript, $entity, $variables);;
+    }
+
+    private function runScript(string $script, Entity $entity, stdClass $variables): void
+    {
         try {
-            $this->formulaManager->run($customScript, $entity, $variables);
+            $this->formulaManager->run($script, $entity, $variables);
         }
         catch (Exception $e) {
             $this->log->error('Before-save formula script failed: ' . $e->getMessage());