diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-16 19:38:15 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2013-05-16 19:38:15 -0400 |
| commit | 84e9669544aa681aaa37d5d1b4ff525ccd50f8f1 (patch) | |
| tree | 1893133c86dc8369bc55632264c1bc356d782c08 /config/squidGuard/squidguard.inc | |
| parent | a4afff763d629af11c450f99d15e30726d03edb3 (diff) | |
| parent | cfd5b4ea97b817685d4f64cb2ca1b0fa1313ba86 (diff) | |
| download | pfsense-packages-84e9669544aa681aaa37d5d1b4ff525ccd50f8f1.tar.gz pfsense-packages-84e9669544aa681aaa37d5d1b4ff525ccd50f8f1.tar.bz2 pfsense-packages-84e9669544aa681aaa37d5d1b4ff525ccd50f8f1.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config/squidGuard/squidguard.inc')
| -rw-r--r-- | config/squidGuard/squidguard.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/squidGuard/squidguard.inc b/config/squidGuard/squidguard.inc index f3126649..1ea1b5a5 100644 --- a/config/squidGuard/squidguard.inc +++ b/config/squidGuard/squidguard.inc @@ -645,10 +645,11 @@ function squidguard_before_form_dest($pkg) { $i=0; foreach($pkg['fields']['field'] as $field) { # order - if (is_array($destination_items) && $field['fieldname'] == 'order') { + if ($field['fieldname'] == 'order') { $fld = &$pkg['fields']['field'][$i]; - foreach($destination_items as $nmkey => $nm) - $fld['options']['option'][] = array('name'=>$nm, 'value'=>$nmkey); + if (is_array($destination_items)) + foreach($destination_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 ! } |