diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2011-03-06 16:18:29 -0500 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2011-03-06 16:18:29 -0500 |
| commit | b4c826ad15331aeb4177b0c2be532baa479b29e8 (patch) | |
| tree | 6fa270511f1483070d3a1628b62fe5508c6f2ba2 /usr/local/www/firewall_rules_edit.php | |
| parent | 283e918079536f7f5fda6cb4866fd82f4ec4421e (diff) | |
| parent | fd4151a94762618d85c446f2140a06f41feef4b6 (diff) | |
| download | pfsense-b4c826ad15331aeb4177b0c2be532baa479b29e8.zip pfsense-b4c826ad15331aeb4177b0c2be532baa479b29e8.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'usr/local/www/firewall_rules_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_rules_edit.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index e4cb57f..a8a6fe3 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -1343,7 +1343,10 @@ $i--): ?> $qselected = 1; echo " SELECTED"; } - echo ">{$q}</option>"; + if (isset($ifdisp[$q])) + echo ">{$ifdisp[$q]}</option>"; + else + echo ">{$q}</option>"; } ?> </select> / @@ -1361,7 +1364,10 @@ $i--): ?> $qselected = 1; echo " SELECTED"; } - echo ">{$q}</option>"; + if (isset($ifdisp[$q])) + echo ">{$ifdisp[$q]}</option>"; + else + echo ">{$q}</option>"; } ?> </select> |
