From e89cb5e6e0ed012e542e2d004f9b9e306d741072 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 31 Aug 2021 15:55:15 +0200
Subject: [PATCH] Bug 28929: Prevent flags to be sent during patron's edition

* selfreg and selfmod for OPAC
* patron's edition on staff

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested OPAC and staff side. Prevents mangling flags column.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz>
---
 members/memberentry.pl   | 1 +
 opac/opac-memberentry.pl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/members/memberentry.pl b/members/memberentry.pl
index 4dd3bfd052..7e9f8523c7 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -222,6 +222,7 @@ if ( $op eq 'insert' || $op eq 'modify' || $op eq 'save' || $op eq 'duplicate' )
 # remove keys from %newdata that is not part of patron's attributes
 {
     my @keys_to_delete = (
+        qr/^flags$/,
         qr/^BorrowerMandatoryField$/,
         qr/^category_type$/,
         qr/^check_member$/,
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 8e934e50d2..895ba921c1 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -491,6 +491,7 @@ sub ParseCgiForBorrower {
     # Replace checkbox 'agreed' by datetime in gdpr_proc_consent
     $borrower{gdpr_proc_consent} = dt_from_string if  $borrower{gdpr_proc_consent} && $borrower{gdpr_proc_consent} eq 'agreed';
 
+    delete $borrower{flags};
     return %borrower;
 }
 
-- 
2.39.5