From e3fff612e005e0dbcdaa404ee026e750d0f30ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Kylm=C3=A4l=C3=A4?= Date: Mon, 31 Aug 2015 11:41:44 +0000 Subject: [PATCH] [PASSED QA] Bug 10933: (follow-up) fix the previous patch to work with master Signed-off-by: Katrin Fischer --- C4/Search/History.pm | 4 ++-- misc/cronjobs/cleanup_database.pl | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/C4/Search/History.pm b/C4/Search/History.pm index acb68e7..53a3758 100644 --- 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 --- 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; -- 1.9.1