diff options
author | Phil Davis <phil.davis@inf.org> | 2016-03-11 22:02:25 +0545 |
---|---|---|
committer | Phil Davis <phil.davis@inf.org> | 2016-03-11 22:02:25 +0545 |
commit | 2f62ed872c59dd308c6eb5aa29028dd93274fed6 (patch) | |
tree | 3c386f61bd0c24fc0eb3cb7208cd769ada535a50 /src/usr/local/www/services_dhcpv6.php | |
parent | bc3c30ebc548c9b1b184166e940d66cc91752a28 (diff) | |
parent | b95e3de4cb39e0b3ef6a0f042b2c96b041019522 (diff) | |
download | pfsense-2f62ed872c59dd308c6eb5aa29028dd93274fed6.zip pfsense-2f62ed872c59dd308c6eb5aa29028dd93274fed6.tar.gz |
Resolve conflicts with master
Diffstat (limited to 'src/usr/local/www/services_dhcpv6.php')
-rw-r--r-- | src/usr/local/www/services_dhcpv6.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index 2640e7f..5ea233f 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -220,9 +220,9 @@ if (is_array($dhcrelaycfg) && isset($dhcrelaycfg['enable']) && isset($dhcrelaycf } } -if ($_POST['apply'] == "Apply Changes") { +if (isset($_POST['apply'])) { $savemsg = dhcpv6_apply_changes(false); -} elseif ($_POST['save'] == "Save") { +} elseif (isset($_POST['save'])) { unset($input_errors); $old_dhcpdv6_enable = ($pconfig['enable'] == true); |