summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-02-09 07:35:46 +0545
committerPhil Davis <phil.davis@inf.org>2016-02-09 07:35:46 +0545
commitddba2645f931937a67986f08af0cbbafa4a395b2 (patch)
tree179cfeb8baebda70c057be22ba99476a3703dd67
parentec0643f7f1537ab6a18ed05fc015ecba598fcffc (diff)
downloadpfsense-ddba2645f931937a67986f08af0cbbafa4a395b2.zip
pfsense-ddba2645f931937a67986f08af0cbbafa4a395b2.tar.gz
Fix #3209 editing unassigned VLAN tag can change an assigned interface - RELENG_2_2
Might as well fix this bug in 2.2.* as well, since it is easy and was obviously an error.
-rw-r--r--usr/local/www/interfaces_vlan_edit.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 5b7d544..08189c7 100644
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -116,7 +116,7 @@ if ($_POST) {
if (isset($id) && $a_vlans[$id]) {
if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) {
if (!empty($a_vlans[$id]['vlanif'])) {
- $confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
+ $confif = convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']);
// Destroy previous vlan
pfSense_interface_destroy($a_vlans[$id]['vlanif']);
} else {
OpenPOWER on IntegriCloud