[request-tracker-maintainers] Bug#400655: request-tracker3.6: search by requestor broken

[Niko Tyni]

Package: request-tracker3.6
Version: 3.6.1-2
Severity: normal
Tags: patch fixed-upstream

Searching by requestor email address is broken in 3.6.1.
The result is

  Unknown field: Requestor.EmailAddress

This has come up several times on the rt-users list, and it's fixed in
upstream svn r5782. It doesn't look like 3.6.2 is going to make it into
Etch, so I think we should backport the fix.

Patch attached as well.

Cheers,
-- 
Niko Tyni		ntyni at iki.fi
-------------- next part --------------
Index: html/Search/Build.html
===================================================================
--- html/Search/Build.html	(revision 5781)
+++ html/Search/Build.html	(revision 5782)
@@ -381,9 +381,13 @@
             $val =~ s!\\(.)!$1!g;
 
             my $class;
-            if ( exists $lcfields{ lc $key } ) {
-                $key   = $lcfields{ lc $key };
-                $class = $FIELDS{$key}->[0];
+
+            my ($key_base, $subkey)  = split(/\./,$key,2);
+            $key_base =~ s/\..*$//; # Strip off .EmailAddress, for example
+
+            if ( exists $lcfields{lc $key_base } ) {
+                $key   = $lcfields{lc $key_base } . (defined $subkey ? '.'.$subkey : '');
+                $class = $FIELDS{$key_base}->[0];
             }
             elsif ( $key =~ /^C(?:ustom)?F(?:ield)?\.{(.*)}$/i ) {
                 $class = $FIELDS{'CF'}->[0];