From f908ef1e11c447a01e3e69db4d4949db068f0b6c Mon Sep 17 00:00:00 2001
From: Emmi Takkinen <emmi.takkinen@outlook.com>
Date: Thu, 19 Mar 2020 09:12:19 +0200
Subject: [PATCH] Bug 4985: Fix Plack scope errors

This patch 'ours' several variables to fix Plack scope errors
in exceptionHolidays.pl.

This also adds '@holidays_list' as parameter to 'edit_holidays'.

Sponsored-by: Koha-Suomi Oy

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 tools/exceptionHolidays.pl | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl
index 680fe17130..7095157617 100755
--- a/tools/exceptionHolidays.pl
+++ b/tools/exceptionHolidays.pl
@@ -17,18 +17,18 @@ my $dbh = C4::Context->dbh();
 checkauth($input, 0, {tools=> 'edit_calendar'}, 'intranet');
 
 
-my $branchcode = $input->param('showBranchName');
+our $branchcode = $input->param('showBranchName');
 my $originalbranchcode  = $branchcode;
-my $weekday = $input->param('showWeekday');
-my $day = $input->param('showDay');
-my $month = $input->param('showMonth');
-my $year = $input->param('showYear');
-my $title = $input->param('showTitle');
-my $description = $input->param('showDescription');
-my $holidaytype = $input->param('showHolidayType');
+our $weekday = $input->param('showWeekday');
+our $day = $input->param('showDay');
+our $month = $input->param('showMonth');
+our $year = $input->param('showYear');
+our $title = $input->param('showTitle');
+our $description = $input->param('showDescription');
+our $holidaytype = $input->param('showHolidayType');
 my $datecancelrange_dt = eval { dt_from_string( scalar $input->param('datecancelrange') ) };
 my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
-my $showoperation = $input->param('showOperation');
+our $showoperation = $input->param('showOperation');
 my $allbranches = $input->param('allBranches');
 
 $title || ($title = '');
@@ -40,7 +40,7 @@ if ($description) {
 }   
 
 # We make an array with holiday's days
-my @holiday_list;
+our @holiday_list;
 if ($datecancelrange_dt){
             my $first_dt = DateTime->new(year => $year, month  => $month,  day => $day);
 
@@ -55,16 +55,16 @@ if ($datecancelrange_dt){
 if($allbranches) {
     my $libraries = Koha::Libraries->search;
     while ( my $library = $libraries->next ) {
-        edit_holiday($showoperation, $library->branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype);
+        edit_holiday($showoperation, $library->branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype, @holiday_list);
     }
 } else {
-    edit_holiday($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype);
+    edit_holiday($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype, @holiday_list);
 }
 
 print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$originalbranchcode&calendardate=$calendardate");
 
 sub edit_holiday {
-    ($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype) = @_;
+    ($showoperation, $branchcode, $weekday, $day, $month, $year, $title, $description, $holidaytype, @holiday_list) = @_;
     my $calendar = C4::Calendar->new(branchcode => $branchcode);
 
     if ($showoperation eq 'exception') {
-- 
2.11.0