aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-04-15 08:32:12 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-04-15 08:32:12 -0300
commit98fe095f85785e2916f6432952853959940ba42a (patch)
tree96a76e254f75c9d09b2ffc4ddd3a9aad67a7fb55
parent2a327575cb6b0eeaa308deb5de351ba12b594701 (diff)
parentb0593ec5d01b1b1d29d7e62a8df5e39687484bfa (diff)
downloadpfsense-packages-98fe095f85785e2916f6432952853959940ba42a.tar.gz
pfsense-packages-98fe095f85785e2916f6432952853959940ba42a.tar.bz2
pfsense-packages-98fe095f85785e2916f6432952853959940ba42a.zip
Merge pull request #859 from dvserg/patch-1
-rw-r--r--config/squidGuard/squidguard.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc
index 0fd450b7..c4c47bcc 100644
--- a/config/squidGuard/squidguard.inc
+++ b/config/squidGuard/squidguard.inc
@@ -502,12 +502,13 @@ function squidguard_before_form_acl(&$pkg, $is_acl=true) {
}
}
# order
- if (is_array($source_items) && $field['fieldname'] == 'order') {
+ if ($field['fieldname'] == 'order') {
$fld = &$pkg['fields']['field'][$i];
- foreach($source_items as $nmkey => $nm)
- $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nmkey);
- $fld['options']['option'][] = array('name'=>'--- Last ---', 'value'=>'9999');
- $fld['options']['option'][] = array('name'=>'-----', 'value'=>''); # ! this is must be last !
+ if (is_array($source_items))
+ foreach($source_items as $nmkey => $nm)
+ $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nmkey);
+ $fld['options']['option'][] = array('name'=>'--- Last ---', 'value'=>'9999');
+ $fld['options']['option'][] = array('name'=>'-----', 'value'=>''); # ! this is must be last !
}
$i++;
}