@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/members/notices.tt | 9 +++++++-- members/notices.pl | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -1,5 +1,6 @@ [% USE raw %] [% USE Asset %] +[% USE String %] [% USE Koha %] [% USE AuthorisedValues %] [% USE Branches %] @@ -64,8 +65,12 @@ [% FOREACH QUEUED_MESSAGE IN QUEUED_MESSAGES %] - [% QUEUED_MESSAGE.subject | html %] - + [% QUEUED_MESSAGE.subject | html %] ([% QUEUED_MESSAGE.content_type %]) + [% IF QUEUED_MESSAGE.content_type.search('html') %] + + [% ELSE %] + + [% END %] [% IF ( QUEUED_MESSAGE.message_transport_type == 'email' ) %]email --- a/members/notices.pl +++ a/members/notices.pl @@ -110,7 +110,7 @@ if ( $op eq 'send_password_reset' ) { } # Getting the messages -my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber}); +my $queued_messages = Koha::Notice::Messages->search({borrowernumber => $borrowernumber}); $template->param( patron => $patron, --