summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-paulius <k.dash.paulius@gmail.com>2016-02-14 14:37:21 -0600
committerk-paulius <k.dash.paulius@gmail.com>2016-02-14 14:37:21 -0600
commit46b7214c3695e60ae062b5357b263781c5f380eb (patch)
tree54ad703341624a8b296712dbbc71501087016c48
parent996272ae23c23332dcb11e82f6035ced107e360c (diff)
downloadpfsense-46b7214c3695e60ae062b5357b263781c5f380eb.zip
pfsense-46b7214c3695e60ae062b5357b263781c5f380eb.tar.gz
Rename 'DHCPv6 Server/RA' to 'DHCPv6 Server & RA' so it does not clash with breadcrumb separator.
-rw-r--r--src/usr/local/www/head.inc2
-rw-r--r--src/usr/local/www/services_dhcpv6.php2
-rw-r--r--src/usr/local/www/services_dhcpv6_edit.php2
-rw-r--r--src/usr/local/www/services_router_advertisements.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc
index 46756cb..ea9fd39 100644
--- a/src/usr/local/www/head.inc
+++ b/src/usr/local/www/head.inc
@@ -253,7 +253,7 @@ $services_menu[] = array(gettext("DHCPv6 Relay"), "/services_dhcpv6_relay.php");
if ($g['services_dhcp_server_enable']) {
$services_menu[] = array(gettext("DHCP Server"), "/services_dhcp.php");
- $services_menu[] = array(gettext("DHCPv6 Server/RA"), "/services_dhcpv6.php");
+ $services_menu[] = array(htmlspecialchars(gettext("DHCPv6 Server & RA")), "/services_dhcpv6.php");
}
$services_menu[] = array(gettext("Dynamic DNS"), "/services_dyndns.php");
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 8d2ed03..d890787 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -436,7 +436,7 @@ if ($_GET['act'] == "del") {
}
}
-$pgtitle = array(gettext("Services"), gettext("DHCPv6 Server/RA"));
+$pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA")));
if (!empty($if) && !$dhcrelay_enabled && isset($iflist[$if])) {
$pgtitle[] = $iflist[$if];
diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php
index 81698b9..f8c26da 100644
--- a/src/usr/local/www/services_dhcpv6_edit.php
+++ b/src/usr/local/www/services_dhcpv6_edit.php
@@ -220,7 +220,7 @@ $ifname = '';
if (!empty($if) && isset($iflist[$if])) {
$ifname = $iflist[$if];
}
-$pgtitle = array(gettext("Services"), gettext("DHCPv6 Server/RA"), $ifname, gettext("DHCPv6 Server"), gettext("Edit Static Mapping"));
+$pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA")), $ifname, gettext("DHCPv6 Server"), gettext("Edit Static Mapping"));
$shortcut_section = "dhcp6";
include("head.inc");
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index e095cd2..9e116e4 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -234,7 +234,7 @@ if ($_POST) {
}
}
-$pgtitle = array(gettext("Services"), gettext("DHCPv6 Server/RA"));
+$pgtitle = array(gettext("Services"), htmlspecialchars(gettext("DHCPv6 Server & RA")));
if (!empty($if) && isset($iflist[$if])) {
$pgtitle[] = $iflist[$if];
OpenPOWER on IntegriCloud