From ab24f9664e470c5f40bbd3568f098bec8b9664e0 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 17 Jan 2018 14:30:06 -0500 Subject: [PATCH] Bug 20008: Fix restrictions added from memberentry.pl if TimeFormat is 12hr Test Plan: 1) Set TimeFormat to 12 hour 2) Add a restriction with an expiration date via memberentry.pl 3) Note the restriction exists, but has no expiration date 4) Apply this patch 5) Repeat step 2 6) Note the restriction exists and has an expiration date! Signed-off-by: Roch D'Amour Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit e2214f2b256e0a44e0936d3eb8e87ac02b40917e) Signed-off-by: Fridolin Somers --- members/memberentry.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 31cbd60eaa..0798e1f7a7 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -118,8 +118,7 @@ if ( $input->param('add_debarment') ) { my $expiration = $input->param('debarred_expiration'); $expiration = $expiration - ? output_pref( - { 'dt' => dt_from_string($expiration), 'dateformat' => 'iso' } ) + ? dt_from_string($expiration)->ymd : undef; AddDebarment( -- 2.39.5