From f45075dd98eefbad6d02794a335204c5dc8d7c74 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 15 Jun 2011 14:22:24 +0000 Subject: [PATCH] Restore this back to allow both users and vouchers enabled at same time. --- etc/inc/captiveportal.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index b0cbf14845..cd419ff54b 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -697,7 +697,7 @@ function captiveportal_prune_old() { } /* if vouchers are configured, activate session timeouts */ - if (!$timedout && isset($config['voucher']['enable'])) { + if (!$timedout && isset($config['voucher']['enable']) && !empty($cpentry[7])) { if ($pruning_time >= ($cpentry[0] + $cpentry[7])) { $timedout = true; $term_cause = 5; // Session-Timeout