diff options
author | Phil Davis <phil.davis@inf.org> | 2016-06-07 15:01:58 +0930 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-06-08 19:12:15 -0400 |
commit | f4ede22769baab85577ff95da98f544d1b67a9f1 (patch) | |
tree | f5dff3b526d7ba126df598da3661e80e87401768 /src/usr/local | |
parent | c87deb1ab570ef0488e01a0ea29b01146c0d7758 (diff) | |
download | pfsense-f4ede22769baab85577ff95da98f544d1b67a9f1.zip pfsense-f4ede22769baab85577ff95da98f544d1b67a9f1.tar.gz |
Fix #6460 Interface mismatch apply changes button
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/interfaces_assign.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 240fb92..68d2d32 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -500,11 +500,11 @@ if (file_exists("/var/run/interface_mismatch_reboot_needed")) { $savemsg = gettext("The system is now rebooting. Please wait."); $class = "success"; } else { - $savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); + $applymsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); $class = "warning"; } } else { - $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click 'Apply Changes'. The firewall will reboot afterwards."); + $applymsg = gettext("Interface mismatch detected. Please resolve the mismatch and click 'Apply Changes'. The firewall will reboot afterwards."); $class = "warning"; } } @@ -513,6 +513,8 @@ if (file_exists("/tmp/reload_interfaces")) { echo "<p>\n"; print_apply_box(gettext("The interface configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); echo "<br /></p>\n"; +} elseif ($applymsg) { + print_apply_box($applymsg); } elseif ($savemsg) { print_info_box($savemsg, $class); } |