Index: branches/5.2.x/core/units/visits/visits_tag_processor.php =================================================================== diff -u -N -r13840 -r14095 --- branches/5.2.x/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 13840) +++ branches/5.2.x/core/units/visits/visits_tag_processor.php (.../visits_tag_processor.php) (revision 14095) @@ -1,6 +1,6 @@ GetISO($params['currency']); foreach($format_fields as $format_field) { - $value = sprintf($list->Fields[$format_field]['format'], $result[$format_field]); + $format = $list->GetFieldOption($format_field, 'format'); + $value = sprintf($format, $result[$format_field]); $value = $this->ConvertCurrency($value, $iso); $value = $this->AddCurrencySymbol($value, $iso); $result[$format_field] = $value; } } - $block_params = array_merge_recursive2($block_params, $result); + $block_params = array_merge($block_params, $result); return $this->Application->ParseBlock($block_params); } - - /*function ShowTotals($params) - { - $list =& $this->GetList($params); - $block_params = $this->prepareTagParams($params); - $block_params = array_merge_recursive2($block_params, $list->Totals); - $block_params['name'] = $this->SelectParam($params, 'render_as,block'); - return $this->Application->ParseBlock($block_params); - }*/ - function ListVisitors($params) { $o = ''; @@ -149,22 +140,13 @@ return $o; } - /* - function OrderLink($params){ - $object = &$this->Application->recallObject($this->getPrefixSpecial()); - $params['ord_id'] = $object->GetDBField('OrderId'); - $main_processor =& $this->Application->recallObject('m_TagProcessor'); - return $main_processor->T($params); - } - */ /** * Enter description here... * - * @param unknown_type $params + * @param string $params * @return kDBList */ - function &GetList($params) { $list_name = $this->SelectParam($params, 'list_name,name');