From f4c40059cadf5f7be8ee226e8e7bd8db02fedd63 Mon Sep 17 00:00:00 2001
From: valentina <pek5892@gmail.com>
Date: Fri, 6 Dec 2024 09:20:50 +0100
Subject: [PATCH] fix: #1546 modifica Marchi

---
 modules/marchi/actions.php | 2 +-
 modules/marchi/edit.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/marchi/actions.php b/modules/marchi/actions.php
index 53ec8edb9..c07afe259 100644
--- a/modules/marchi/actions.php
+++ b/modules/marchi/actions.php
@@ -28,7 +28,7 @@ switch (post('op')) {
         $nome = filter('name');
         $link = filter('link');
 
-        $marchio_new = Marchio::where('name', '=', $nome)->first();
+        $marchio_new = Marchio::where('name', '=', $nome)->where('id', '!=', $id_record)->first();
 
         if (!empty($marchio_new)) {
             flash()->error(tr('Questo nome è già stato utilizzato per un altro marchio.'));
diff --git a/modules/marchi/edit.php b/modules/marchi/edit.php
index 3e9bb93e6..b1f5b4cb0 100644
--- a/modules/marchi/edit.php
+++ b/modules/marchi/edit.php
@@ -48,7 +48,7 @@ include_once __DIR__.'/../../core.php';
 $articoli = $marchio->articoli;
 $class = '';
 
-if (!empty($articoli)) {
+if (!empty(count($articoli))) {
     echo '
 <div class="card card-warning collapsable collapsed-card">
     <div class="card-header with-border">