Patch for bug 258711: move.pl should honour emailsuffix; patch by Marc Schumann <wurblzap@gmail.com>, r=justdave, a=justdave.

3 files changed, 3 insertions, 4 deletions

diff --git a/move.pl b/move.pl
index 1e8036f01..8218c4069 100755
--- a/move.pl
+++ b/move.pl
@@ -161,8 +161,7 @@ foreach (@fieldlist) {
     $displayfields{$_} = 1;
 }
 
-$template->process("bug/show.xml.tmpl", { user => { login => $exporter },
-                                          bugs => \@bugs,
+$template->process("bug/show.xml.tmpl", { bugs => \@bugs,
                                           displayfields => \%displayfields,
                                         }, \$msg)
   || ThrowTemplateError($template->error());
diff --git a/process_bug.cgi b/process_bug.cgi
index 6ee94a161..221bf58f0 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -559,7 +559,7 @@ if (defined $::FORM{action}) {
   $action = trim($::FORM{action});
 }
 if (Param("move-enabled") && $action eq Param("move-button-text")) {
-  $::FORM{'buglist'} = join (":", @idlist);
+  $cgi->param('buglist', join (":", @idlist));
   do "move.pl" || die "Error executing move.cgi: $!";
   PutFooter();
   exit;
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 37cead53d..8b29537a4 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -26,7 +26,7 @@
           urlbase="[% Param('urlbase') %]"
           maintainer="[% Param('maintainer') FILTER xml %]"
 [% IF user.id %]
-          exporter="[% user.login FILTER xml %]"
+          exporter="[% user.email FILTER xml %]"
 [% END %]
 >