From 1ef81a4bf154c6b8dea2c1b00c4753ab3af378b6 Mon Sep 17 00:00:00 2001
From: akrasilnikov <akrasilnikov@6955db30-a419-402b-8a0d-67ecbb4d7f56>
Date: Tue, 15 Oct 2013 11:18:37 +0000
Subject: [PATCH] Bug 136255 - split keywords into single row in email header

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1849 6955db30-a419-402b-8a0d-67ecbb4d7f56
---
 Bugzilla/BugMail.pm                                          | 3 +++
 template/en/custom/email/newchangedmail-СМ-OK.txt.tmpl     | 4 +++-
 template/en/custom/email/newchangedmail-СМ-RMS.txt.tmpl    | 4 +++-
 template/en/custom/email/newchangedmail-СМ-View.txt.tmpl   | 4 +++-
 template/en/custom/email/newchangedmail-СМ-МРТ.txt.tmpl | 4 +++-
 template/en/custom/email/newchangedmail-СМ-Опт.txt.tmpl | 4 +++-
 template/en/default/email/newchangedmail.txt.tmpl            | 4 +++-
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 75cb183d3..de017a1f9 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -633,6 +633,8 @@ sub sendMail
     push @watchingrel, 'None' unless @watchingrel;
     push @watchingrel, map { user_id_to_login($_) } @$watchingRef;
 
+    my @keywords_array = split(", ", $values{'keywords'});
+
     my $vars = {
         isnew              => $isnew,
         showfieldvalues    => \@showfieldvalues,
@@ -645,6 +647,7 @@ sub sendMail
         product            => $values{'product'},
         comp               => $values{'component'},
         keywords           => $values{'keywords'},
+        keywords_array     => \@keywords_array,
         severity           => $values{'bug_severity'},
         status             => $values{'bug_status'},
         priority           => $values{'priority'},
diff --git a/template/en/custom/email/newchangedmail-СМ-OK.txt.tmpl b/template/en/custom/email/newchangedmail-СМ-OK.txt.tmpl
index 920be2a6e..ea7baec8c 100644
--- a/template/en/custom/email/newchangedmail-СМ-OK.txt.tmpl
+++ b/template/en/custom/email/newchangedmail-СМ-OK.txt.tmpl
@@ -37,7 +37,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer %]
 X-Bugzilla-Status: [% status %]
diff --git a/template/en/custom/email/newchangedmail-СМ-RMS.txt.tmpl b/template/en/custom/email/newchangedmail-СМ-RMS.txt.tmpl
index 920be2a6e..ea7baec8c 100644
--- a/template/en/custom/email/newchangedmail-СМ-RMS.txt.tmpl
+++ b/template/en/custom/email/newchangedmail-СМ-RMS.txt.tmpl
@@ -37,7 +37,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer %]
 X-Bugzilla-Status: [% status %]
diff --git a/template/en/custom/email/newchangedmail-СМ-View.txt.tmpl b/template/en/custom/email/newchangedmail-СМ-View.txt.tmpl
index 920be2a6e..ea7baec8c 100644
--- a/template/en/custom/email/newchangedmail-СМ-View.txt.tmpl
+++ b/template/en/custom/email/newchangedmail-СМ-View.txt.tmpl
@@ -37,7 +37,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer %]
 X-Bugzilla-Status: [% status %]
diff --git a/template/en/custom/email/newchangedmail-СМ-МРТ.txt.tmpl b/template/en/custom/email/newchangedmail-СМ-МРТ.txt.tmpl
index 920be2a6e..ea7baec8c 100644
--- a/template/en/custom/email/newchangedmail-СМ-МРТ.txt.tmpl
+++ b/template/en/custom/email/newchangedmail-СМ-МРТ.txt.tmpl
@@ -37,7 +37,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer %]
 X-Bugzilla-Status: [% status %]
diff --git a/template/en/custom/email/newchangedmail-СМ-Опт.txt.tmpl b/template/en/custom/email/newchangedmail-СМ-Опт.txt.tmpl
index 920be2a6e..ea7baec8c 100644
--- a/template/en/custom/email/newchangedmail-СМ-Опт.txt.tmpl
+++ b/template/en/custom/email/newchangedmail-СМ-Опт.txt.tmpl
@@ -37,7 +37,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer %]
 X-Bugzilla-Status: [% status %]
diff --git a/template/en/default/email/newchangedmail.txt.tmpl b/template/en/default/email/newchangedmail.txt.tmpl
index d7e994c96..ecb0cc7ef 100644
--- a/template/en/default/email/newchangedmail.txt.tmpl
+++ b/template/en/default/email/newchangedmail.txt.tmpl
@@ -33,7 +33,9 @@ X-Priority: 1
 [% END %]
 X-Bugzilla-Product: [% product %]
 X-Bugzilla-Component: [% comp %]
-X-Bugzilla-Keywords: [% keywords %]
+[% FOREACH keyword_item = keywords_array %]
+X-Bugzilla-Keywords: [% keyword_item %]
+[% END%]
 X-Bugzilla-Severity: [% severity %]
 X-Bugzilla-Who: [% changer.login %]
 X-Bugzilla-Status: [% status %]