Index: branches/5.2.x/units/orders/orders_tag_processor.php =================================================================== diff -u -N -r14827 -r14828 --- branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14827) +++ branches/5.2.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 14828) @@ -1,6 +1,6 @@ getObject($params); - $shipping_info = unserialize( $object->GetDBField('ShippingInfo') ); - if (count($shipping_info) > 1) { + /* @var $object kDBItem */ + + $shipping_info = unserialize($object->GetDBField('ShippingInfo')); + + if ( count($shipping_info) > 1 ) { return $this->Application->Phrase('lu_MultipleShippingTypes'); } - $shipping_info = array_shift($shipping_info); - return $shipping_info['ShippingName']; + + if ( $shipping_info ) { + $shipping_info = array_shift($shipping_info); + + return $shipping_info['ShippingName']; + } + + return ''; } function DiscountHelpLink($params) @@ -1327,14 +1336,18 @@ $o = ''; asort($element_order, SORT_NUMERIC); + $block_params = $this->prepareTagParams($params); + foreach ($element_order as $type => $order) { $element = getArrayValue($params, $type . '_render_as'); if ( !in_array($type, $totals) || !$element ) { continue; } - $o .= $this->Application->ParseBlock(Array ('name' => $element), 1); + $block_params['name'] = $element; + + $o .= $this->Application->ParseBlock($block_params); } return $o;