From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 8 Nov 2018 14:03:15 +0000 (-0300)
Subject: Bug 15184: Fix bad merge conflict with created_by
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=41ebda2d95f6d01c068a7f4ab82c160105050678;p=koha.git

Bug 15184: Fix bad merge conflict with created_by

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

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

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 663ab604ae..248ff76eb7 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -87,7 +87,7 @@ my $filters = {
     orderstatus             => scalar $input->param('orderstatus'),
     ordernumber             => scalar $input->param('ordernumber'),
     search_children_too     => scalar $input->param('search_children_too'),
-    created_by              => scalar $input->multi_param('created_by'),
+    created_by              => [ $input->multi_param('created_by') ],
 };
 my $from_placed_on = eval { dt_from_string( scalar $input->param('from') ) } || dt_from_string;
 my $to_placed_on   = eval { dt_from_string( scalar $input->param('to')   ) } || dt_from_string;