From 234768752fd7448fcafe69d54772507c3492a6c3 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 3 Nov 2020 16:57:52 +0100
Subject: [PATCH] Bug 14866: Trivial code simplification

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 C4/Circulation.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index a515282ce4..72ff091b80 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1330,7 +1330,6 @@ sub checkHighHolds {
 
         my $orig_due = C4::Circulation::CalcDateDue( $issuedate, $itype, $branchcode, $borrower );
 
-        my $decreaseLoanHighHoldsDuration = C4::Context->preference('decreaseLoanHighHoldsDuration');
         my $rule = Koha::CirculationRules->get_effective_rule(
             {
                 categorycode => $borrower->{categorycode},
@@ -1339,16 +1338,15 @@ sub checkHighHolds {
                 rule_name    => 'decreaseloanholds',
             }
         );
-        my $reduced_datedue;
+
         my $duration;
         if ( defined($rule) && $rule->rule_value ne '' ){
             # overrides decreaseLoanHighHoldsDuration syspref
             $duration = $rule->rule_value;
-            $reduced_datedue = $calendar->addDate( $issuedate, $rule->rule_value );
         } else {
-            $duration = $decreaseLoanHighHoldsDuration;
-            $reduced_datedue = $calendar->addDate( $issuedate, $decreaseLoanHighHoldsDuration );
+            $duration = C4::Context->preference('decreaseLoanHighHoldsDuration');
         }
+        my $reduced_datedue = $calendar->addDate( $issuedate, $duration );
         $reduced_datedue->set_hour($orig_due->hour);
         $reduced_datedue->set_minute($orig_due->minute);
         $reduced_datedue->truncate( to => 'minute' );
-- 
2.39.5