[Rt-commit] r17999 - in rt/3.999/branches/merge_to_3.8.2: .

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu Jan 29 04:11:34 2009
New Revision: 17999

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString

Log:
 r19189 at sunnavys-mb:  sunnavy | 2009-01-29 16:39:17 +0800
 merged share/html/Search/Elements/BuildFormatString


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Search/Elements/BuildFormatString	Thu Jan 29 04:11:34 2009
@@ -85,8 +85,9 @@
     depends_on   depended_on_by
     member_of    members
     parents     children
+    Bookmark
     NEWLINE     Bookmark
-);
+); # loc_qw
 
 $m->callback( CallbackOnce => 1, Callbackname => 'set_fields_once', Fields => \@fields );
 
@@ -133,7 +134,9 @@
 }
 
 if ( $remove_col ) {
-    my $index  = $current_display_columns;
+    # we do this regex match to avoid a non-numeric warning
+    my ($index) = $current_display_columns =~ /^(\d+)/;
+    
     my $column = $seen[$index];
     if ($index) {
         delete $seen[$index];