From 04f722683929a9f18c5f5fd9706bf6d834779b54 Mon Sep 17 00:00:00 2001
From: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov>
Date: Sun, 24 Mar 2024 15:58:47 -0400
Subject: [PATCH] Bug 35559: Revert changes from bug 34634

This reverts commit fad3af0005c3a4234634ee477fafc85902540843

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 33465f2f7ae0d00775a207b793037fc15b89177d)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 7 +------
 reserve/request.pl                                       | 2 --
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
index 27c080009e..1c184e16ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -127,12 +127,7 @@
                     [% END %]
                 </td>
                 <td>
-                    [% UNLESS hold.expired %]
-                        <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
-                    [% ELSE %]
-                        <span class="expiredon"><label>Expired:</label> [% hold.expirationdate | $KohaDates %]</span>
-                        <input type="hidden" value="[% hold.expirationdate | html %]"  name="expirationdate" />
-                    [% END %]
+                    <input type="text" class="flatpickr" data-flatpickr-futuredate="true" value="[% hold.expirationdate | html %]" size="10" name="expirationdate" />
                 </td>
                 <td>
                     [%- IF ( hold.found ) -%]
diff --git a/reserve/request.pl b/reserve/request.pl
index c7c62f1dca..fbd863c707 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -635,8 +635,6 @@ if (   ( $findborrower && $borrowernumber_hold || $findclub && $club_hold )
                     }
                 }
                 $reserve{'expirationdate'} = $res->expirationdate;
-                $reserve{'expired'}        = 1
-                    if ( DateTime->compare( dt_from_string( $res->expirationdate ), dt_from_string() ) == -1 );
                 $reserve{'date'}           = $res->reservedate;
                 $reserve{'borrowernumber'} = $res->borrowernumber();
                 $reserve{'biblionumber'}   = $res->biblionumber();
-- 
2.39.5