Index: branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -N -r13086 -r13867 --- branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 13086) +++ branches/5.1.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 13867) @@ -1,5 +1,5 @@ - - $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); + + $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); Index: branches/5.1.x/core/units/helpers/csv_helper.php =================================================================== diff -u -N -r13569 -r13867 --- branches/5.1.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 13569) +++ branches/5.1.x/core/units/helpers/csv_helper.php (.../csv_helper.php) (revision 13867) @@ -1,6 +1,6 @@ $field_data) { - $header = $this->Application->Phrase( $field_data['title'] ); + $use_phrases = array_key_exists('use_phrases', $field_data) ? $field_data['use_phrases'] : 1; + $header = $use_phrases ? $this->Application->Phrase( $field_data['title'] ) : $field_data['title']; array_push($headers, $header); } $csv_line = getcsvline($headers, $export_data['delimiter'], $export_data['enclosure'], $export_data['record_separator']);