diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-02 15:08:05 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-02 15:08:05 +0700 |
| commit | 44d57a2bf2b2ad139a40b57a53962924eee73edb (patch) | |
| tree | 6a92ccf1b52cb780771b81c03b655f49650f8432 /usr/local/www/interfaces_assign.php | |
| parent | c9797064082250643d7724171618fc7e693ac494 (diff) | |
| parent | 0acae2a0f8cb8c48702c357ba3afaff673232a4d (diff) | |
| download | pfsense-44d57a2bf2b2ad139a40b57a53962924eee73edb.zip pfsense-44d57a2bf2b2ad139a40b57a53962924eee73edb.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Diffstat (limited to 'usr/local/www/interfaces_assign.php')
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index fbba05b..ed80d46 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -260,6 +260,7 @@ if ($_GET['act'] == "del") { $input_errors[] = "The interface is part of a gif tunnel. Please delete the tunnel to continue"; else { unset($config['interfaces'][$id]['enable']); + $realid = get_real_interface($id); interface_bring_down($id); /* down the interface */ unset($config['interfaces'][$id]); /* delete the specified OPTn or LAN*/ @@ -311,7 +312,7 @@ if ($_GET['act'] == "del") { unset($config['dhcpd']['wan']); } - link_interface_to_vlans($id, "update"); + link_interface_to_vlans($realid, "update"); $savemsg = "Interface has been deleted."; } |
