summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-06-07 15:01:58 +0930
committerChris Buechler <cmb@pfsense.org>2016-06-08 19:12:35 -0400
commitd9f088f5a501b975935bb1eeedb3fd16a82a6105 (patch)
tree4dbebf78e8b57b7a48612f1db2f95d10debb37c6
parent9fd4b658857a14cfddf25141acaac89a4d6e9927 (diff)
downloadpfsense-d9f088f5a501b975935bb1eeedb3fd16a82a6105.zip
pfsense-d9f088f5a501b975935bb1eeedb3fd16a82a6105.tar.gz
Fix #6460 Interface mismatch apply changes button
-rw-r--r--src/usr/local/www/interfaces_assign.php6
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);
}
OpenPOWER on IntegriCloud