From 7b67ac6ce5fd59a7ae13a5cba4595d3b536b71ad Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 23 Nov 2018 12:02:51 +0100 Subject: [PATCH] Bug 21874: (QA follow-up) Fix intranet sendshelf Move encode line below regex line. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit c1ec452e5ce454b99433972a34ec1154e81a19a3) Signed-off-by: Jesse Maseto (cherry picked from commit 22b472918026bb0ad8d7fcf693e290f07e85b62c) Signed-off-by: Fridolin Somers --- virtualshelves/sendshelf.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 4f6bdc186c..ee5961a030 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -114,10 +114,11 @@ if ($email) { # Analysing information and getting mail properties if ( $template_res =~ /(.*)/s ) { - $mail{'subject'} = encode('MIME-Header', $1); + $mail{subject} = $1; $mail{subject} =~ s|\n?(.*)\n?|$1|; } else { $mail{'subject'} = "no subject"; } + $mail{subject} = encode( 'MIME-Header', $mail{subject} ); my $email_header = ""; if ( $template_res =~ /
(.*)/s ) { -- 2.39.5