Index: branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r5970 -r6002 --- branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 5970) +++ branches/unlabeled/unlabeled-1.62.2/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 6002) @@ -568,7 +568,6 @@ } } - if( getArrayValue($params,'nl2br' ) ) $value = nl2br($value); if( !$this->HasParam($params, 'no_special') ) $value = htmlspecialchars($value); if( getArrayValue($params,'checked' ) ) $value = ($value == ( isset($params['value']) ? $params['value'] : 1)) ? 'checked' : ''; if( getArrayValue($params,'as_label') ) $value = $this->Application->Phrase($value); @@ -580,6 +579,7 @@ $value = substr($value,0,$first_chars); if($needs_cut) $value .= ' ...'; } + if( getArrayValue($params,'nl2br' ) ) $value = nl2br($value); if ($value != '') $this->Application->Parser->DataExists = true; Index: branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -r5856 -r6002 --- branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 5856) +++ branches/unlabeled/unlabeled-1.36.2/kernel/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 6002) @@ -161,8 +161,8 @@ - - + + @@ -220,7 +220,7 @@ $Menus[''+'_filter_menu'].addMenuSeparator(); - + // sorting menu $Menus[''+'_sorting_menu'] = new Menu(''); @@ -230,7 +230,7 @@ $Menus[''+'_sorting_menu'].addMenuItem('','reset_sorting("");'); - + // per page menu $Menus[''+'_perpage_menu'] = new Menu(''); @@ -240,15 +240,15 @@ $Menus[''+'_perpage_menu'].addMenuItem('100','set_per_page("",100,);','2'); $Menus[''+'_perpage_menu'].addMenuItem('500','set_per_page("",500,);','2'); - + // select menu $Menus[''+'_select_menu'] = new Menu(''); $Menus[''+'_select_menu'].addMenuItem('','Grids[""].SelectAll();'); $Menus[''+'_select_menu'].addMenuItem('','Grids[""].ClearSelection();'); $Menus[''+'_select_menu'].addMenuItem('','Grids[""].InvertSelection();'); - + processHooks('ViewMenu', hBEFORE, ''); $Menus[''+'_view_menu'] = new Menu('');