Bug 10933: (follow-up) fix the previous patch to work with master

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/C4/Search/History.pm b/C4/Search/History.pm
index acb68e7..53a3758 100644 (file)
--- a/C4/Search/History.pm
+++ b/C4/Search/History.pm
@@ -73,8 +73,8 @@ sub delete {
         $id = $id ? [ $id ] : [];
     }
 
-    unless ( $userid or @$id ) {
-        warn "ERROR: userid or id is required for history deletion";
+    unless ( $userid or @$id or $interval ) {
+        warn "ERROR: userid, id or interval is required for history deletion";
         return;
     }
 

diff --git a/misc/cronjobs/cleanup_database.pl b/misc/cronjobs/cleanup_database.pl
index 41a41ae..e882b4b 100755 (executable)
--- a/misc/cronjobs/cleanup_database.pl
+++ b/misc/cronjobs/cleanup_database.pl
@@ -37,6 +37,7 @@ BEGIN {
 use C4::Context;
 use C4::Dates;
 use C4::Search;
+use C4::Search::History;
 use Getopt::Long;
 use C4::Log;