Index: branches/5.2.x/units/shipping/shipping_tag_processor.php =================================================================== diff -u -N -r15156 -r15540 --- branches/5.2.x/units/shipping/shipping_tag_processor.php (.../shipping_tag_processor.php) (revision 15156) +++ branches/5.2.x/units/shipping/shipping_tag_processor.php (.../shipping_tag_processor.php) (revision 15540) @@ -1,6 +1,6 @@ getObject($params); + /* @var $object kDBItem */ + + $o = ''; $selected = trim($object->GetDBField('PortalGroups'), ','); $selected_arr = explode(',', $selected); - $all_groups = $this->Conn->Query('SELECT GroupId, Name FROM '.TABLE_PREFIX.'UserGroups ORDER BY NAME', 'GroupId'); - $o = ''; - foreach ($all_groups as $a_group) - { + $sql = 'SELECT GroupId, Name + FROM ' . TABLE_PREFIX . 'UserGroups + ORDER BY Name'; + $all_groups = $this->Conn->Query($sql, 'GroupId'); + + $mode = array_key_exists('mode', $params) ? $params['mode'] : false; + + foreach ($all_groups as $a_group) { $is_selected = in_array($a_group['GroupId'], $selected_arr); - $continue = $params['mode'] == 'selected' ? !$is_selected : $is_selected; - if ($continue) continue; + $continue = $mode == 'selected' ? !$is_selected : $is_selected; + + if ( $continue ) { + continue; + } + $block_params = $a_group; - $block_params['name'] = $params['render_as']; + $block_params['name'] = $params['render_as']; $o .= $this->Application->ParseBlock($block_params); } + return $o; } } \ No newline at end of file