summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-12-01 11:22:55 +0000
committerErmal <eri@pfsense.org>2010-12-01 11:22:55 +0000
commit1dbc0c4384dbec766b59986895b7537b5d1c8b23 (patch)
treeed3c10c002ad836f28179dcf189029136420327d
parent7eb2ebbe2195e1840a45dbf7689a9ef0909e8bb9 (diff)
downloadpfsense-1dbc0c4384dbec766b59986895b7537b5d1c8b23.zip
pfsense-1dbc0c4384dbec766b59986895b7537b5d1c8b23.tar.gz
Use correct variable name. Also related to Ticket #847.
-rw-r--r--etc/inc/interfaces.inc2
-rwxr-xr-xusr/local/www/interfaces_groups_edit.php1
2 files changed, 1 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 371be4a..a45ea12 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3112,7 +3112,7 @@ function link_interface_to_group($int) {
if (is_array($config['ifgroups']['ifgroupentry'])) {
foreach ($config['ifgroups']['ifgroupentry'] as $group) {
- if (in_array($int, explode(" ", $groupname['members'])))
+ if (in_array($int, explode(" ", $group['members'])))
return "{$group['ifname']}";
}
}
diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php
index adfb102..253be67 100755
--- a/usr/local/www/interfaces_groups_edit.php
+++ b/usr/local/www/interfaces_groups_edit.php
@@ -96,7 +96,6 @@ if ($_POST) {
$ifgroupentry['descr'] = mb_convert_encoding($_POST['descr'],"HTML-ENTITIES","auto");
if (isset($id) && $a_ifgroups[$id] && $_POST['ifname'] != $a_ifgroups[$id]['ifname']) {
-
if (!empty($config['filter']) && is_array($config['filter']['rule'])) {
foreach ($config['filter']['rule'] as $ridx => $rule) {
if (isset($rule['floating'])) {
OpenPOWER on IntegriCloud