aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorbmeeks8 <bmeeks8@bellsouth.net>2014-01-25 12:09:30 -0500
committerbmeeks8 <bmeeks8@bellsouth.net>2014-01-25 12:09:30 -0500
commit055c7b095d28d7f7bd5722a43da6f032ee3b0d7f (patch)
tree00e6e6dc2e0e36bac136d8a51ee15d8284f449a4 /config
parent19016394152847b136ca0a1c02f498fa04ddba51 (diff)
parent81d43d9b8f6c66de409b24be746fa742473329ff (diff)
downloadpfsense-packages-055c7b095d28d7f7bd5722a43da6f032ee3b0d7f.tar.gz
pfsense-packages-055c7b095d28d7f7bd5722a43da6f032ee3b0d7f.tar.bz2
pfsense-packages-055c7b095d28d7f7bd5722a43da6f032ee3b0d7f.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config')
-rw-r--r--config/haproxy-devel/haproxy_listeners_edit.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/config/haproxy-devel/haproxy_listeners_edit.php b/config/haproxy-devel/haproxy_listeners_edit.php
index 2fd9a6c3..3c62ec3a 100644
--- a/config/haproxy-devel/haproxy_listeners_edit.php
+++ b/config/haproxy-devel/haproxy_listeners_edit.php
@@ -299,15 +299,17 @@ $interfaces = haproxy_get_bindable_interfaces();
secondary = d.getElementById("secondary");
primary_frontend = d.getElementById("primary_frontend");
- if (secondary.checked)
+ if ((secondary !== null) && (secondary.checked))
type = primaryfrontends[primary_frontend.value]['ref']['type'];
else
type = d.getElementById("type").value;
setCSSdisplay(".haproxy_ssloffloading_enabled", ssloffload.checked);
setCSSdisplay(".haproxy_mode_http", type == "http");
- setCSSdisplay(".haproxy_primary", !secondary.checked);
- setCSSdisplay(".haproxy_secondary", secondary.checked);
+ if (secondary !== null) {
+ setCSSdisplay(".haproxy_primary", !secondary.checked);
+ setCSSdisplay(".haproxy_secondary", secondary.checked);
+ }
type_change(type);