Bug 17569: Do not limit by branch if option is not passed

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/misc/cronjobs/membership_expiry.pl b/misc/cronjobs/membership_expiry.pl
index 3b4b885..260a9f8 100755 (executable)
--- a/misc/cronjobs/membership_expiry.pl
+++ b/misc/cronjobs/membership_expiry.pl
@@ -167,7 +167,13 @@ if( !$expdays ) {
 
 my $admin_adress = C4::Context->preference('KohaAdminEmailAddress');
 warn 'getting upcoming membership expires' if $verbose;
-my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires({ 'me.branchcode' => $branch, before => $before, after => $after });
+my $upcoming_mem_expires = Koha::Patrons->search_upcoming_membership_expires(
+    {
+        ( $branch ? ( 'me.branchcode' => $branch ) : () ),
+        before => $before,
+        after  => $after,
+    }
+);
 warn 'found ' . $upcoming_mem_expires->count . ' soon expiring members'
     if $verbose;