diff options
author | Ermal <eri@pfsense.org> | 2014-09-08 22:44:45 +0200 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2014-09-08 22:44:45 +0200 |
commit | a1b5f07b047b3f27e6326c718eec43167e3bf6dd (patch) | |
tree | 82b4a2ae876daddca203b1a95a3af4325c574b33 | |
parent | fa9667d2b90c030aeffd896f5dd680c7f5ae677b (diff) | |
download | pfsense-a1b5f07b047b3f27e6326c718eec43167e3bf6dd.zip pfsense-a1b5f07b047b3f27e6326c718eec43167e3bf6dd.tar.gz |
Fixes #3664, actually make sense of this function to work properly
-rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index f9b0da5..5490586 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -4142,6 +4142,7 @@ function convert_friendly_interface_to_friendly_descr($interface) { break; case "enc0": case "ipsec": + case "IPsec": $ifdesc = "IPsec"; break; default: @@ -4175,14 +4176,11 @@ function convert_friendly_interface_to_friendly_descr($interface) { } function convert_real_interface_to_friendly_descr($interface) { - global $config; $ifdesc = convert_real_interface_to_friendly_interface_name("{$interface}"); - if ($ifdesc) { - $iflist = get_configured_interface_with_descr(false, true); - return $iflist[$ifdesc]; - } + if (!empty($ifdesc)) + return convert_friendly_interface_to_friendly_descr($ifdesc); return $interface; } |