diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
| commit | 8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b (patch) | |
| tree | cecf571643c08858880695d453d4f199649423f9 /etc/inc/captiveportal.inc | |
| parent | 86385ef36f81052afc3febdbce3a3af49373c7a6 (diff) | |
| parent | 245da5436bc5a30d6c65d68dbd54a56dca1ec896 (diff) | |
| download | pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.zip pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
etc/inc/pkg-utils.inc
etc/inc/service-utils.inc
etc/inc/system.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index c403252..c27eac0 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -53,7 +53,7 @@ require_once("voucher.inc"); function get_default_captive_portal_html() { global $config, $g; // Detect if vouchers are being used and default to the voucher page - if($config['voucher']) { + if(isset($config['voucher']['enable'])) { $htmltext = <<<EOD <html> <body> |
