diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-12 12:55:32 -0300 |
| commit | e73b001e2585b55973faaf0be199a5f438c4ae89 (patch) | |
| tree | 6dc08100313fe95ab4ca2dfa9883c23152dd4538 /usr/local/www/firewall_nat_edit.php | |
| parent | 3e6ec5dfba9679f6b521962269aca9570e391abb (diff) | |
| parent | 3e4f5a3359ebcc46710f37466620d0c0cdfd7293 (diff) | |
| download | pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.zip pfsense-e73b001e2585b55973faaf0be199a5f438c4ae89.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/diag_smart.php
usr/local/www/firewall_rules_edit.php
usr/local/www/interfaces.php
usr/local/www/load_balancer_pool_edit.php
usr/local/www/pkg_mgr_settings.php
Diffstat (limited to 'usr/local/www/firewall_nat_edit.php')
| -rwxr-xr-x | usr/local/www/firewall_nat_edit.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php index 4ae3720..ceded3d 100755 --- a/usr/local/www/firewall_nat_edit.php +++ b/usr/local/www/firewall_nat_edit.php @@ -775,6 +775,7 @@ include("fbegin.inc"); ?> <?php $linkedrule = ""; if (is_array($config['filter']['rule'])) { + filter_rules_sort(); foreach ($config['filter']['rule'] as $filter_id => $filter_rule) { if (isset($filter_rule['associated-rule-id'])) { echo "<option value=\"{$filter_rule['associated-rule-id']}\""; |
