From a9ca0866dd84aaec63de444cd28d59b77bce9ad0 Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 21 Nov 2018 08:41:10 -0500
Subject: [PATCH] Bug 1508903 - internal error on requests.cgi:  Bad argument
 param sent to Bugzilla::User::new function.

---
 request.cgi                                 | 2 +-
 template/en/default/request/queue.csv.tmpl  | 2 +-
 template/en/default/request/queue.html.tmpl | 1 +
 template/en/default/request/queue.json.tmpl | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/request.cgi b/request.cgi
index 712013d78..071f1ccab 100755
--- a/request.cgi
+++ b/request.cgi
@@ -289,7 +289,7 @@ sub queue {
           'attach_id'       => $data->[7] ,
           'attach_summary'  => $data->[8] ,
           'requester'       => Bugzilla::User->new({ name => $data->[10], cache => 1 }) ,
-          'requestee'       => Bugzilla::User->new({ name => $data->[12], cache => 1 }) ,
+          'requestee'       => $data->[12] ? Bugzilla::User->new({ name => $data->[12], cache => 1 }) : undef ,
           'restricted'      => $data->[13] ? 1 : 0,
           'created'         => $data->[14],
           'attach_mimetype' => $data->[15],
diff --git a/template/en/default/request/queue.csv.tmpl b/template/en/default/request/queue.csv.tmpl
index 16c7bd780..b1ed04abd 100644
--- a/template/en/default/request/queue.csv.tmpl
+++ b/template/en/default/request/queue.csv.tmpl
@@ -35,7 +35,7 @@ No requests.
     [% FOREACH column = display_columns %]
       [% IF column == 'created' %]
         [% request.$column FILTER time FILTER csv %]
-      [% ELSIF column.match('^requeste') %]
+      [% ELSIF column.match('^requeste') && request.$column %]
         [% IF request.$column.name %]
           [% request.$column.name _ ' <' _ request.$column.email _ '>' FILTER email FILTER csv %]
         [% ELSE %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index e87b703ac..2e0bda1d7 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -265,6 +265,7 @@ to some group are shown by default.
 [% END %]
 
 [% BLOCK display_requestee %]
+  [% RETURN IF !request.requestee %]
   [% IF request.requestee.name %]
     [% request.requestee.name _ ' <' _ request.requestee.email _ '>' FILTER email FILTER html %]
   [% ELSE %]
diff --git a/template/en/default/request/queue.json.tmpl b/template/en/default/request/queue.json.tmpl
index bc106a10b..4f832a010 100644
--- a/template/en/default/request/queue.json.tmpl
+++ b/template/en/default/request/queue.json.tmpl
@@ -22,10 +22,10 @@ foreach my $request (@$requests) {
             $val = $time_filter->( $request->{$column} );
         }
         elsif ( $column =~ /^requeste/ ) {
-            $val = {
+            $val = $request->{$column} ? {
                 nick => $request->{$column}->nick,
                 gravatar => $request->{$column}->gravatar,
-            };
+            } : undef;
         }
         elsif ( $column =~ /_id$/ ) {
             $val = $request->{$column} ? 0 + $request->{$column} : undef;
-- 
2.47.3