From 7098a36b19c35a06a51361bd381416a1204de38d Mon Sep 17 00:00:00 2001 From: Aleisha Date: Wed, 1 Jul 2015 01:36:00 +0000 Subject: [PATCH] Bug 14445: Silences warns in letter.tt When creating a new notice, warn is triggered "Argument "" isn't numeric in numeric gt (>) at line 400". Same warn is triggered when changing Koha module option to any other module. To test: 1) Go to Tools, then Notices & Slips 2) Click 'new notice'. Notice warn in intranet-error.log 3) Change Koha module to another module. Notice warn is triggered for every change 4) Apply patch and reload page 5) Change Koha module to another module. Notice there are no longer warns 6) Go back to Notices & Slips and click 'new notice' again. Notice there are no warns Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt | 6 +++--- tools/letter.pl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt index 06bf5851aa..c20c6b7ad7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt @@ -401,14 +401,14 @@ $(document).ready(function() {
  • [% IF letter.message_transport_type == 'sms' %] - [% IF letter.content.length > 0 %][% letter.content.length %][% ELSE %]0[% END %]/160 characters + [% IF letter.content && letter.content.length > 0 %][% letter.content.length %][% ELSE %]0[% END %]/160 characters [% END %] diff --git a/tools/letter.pl b/tools/letter.pl index 8ef07be5eb..bb54d7e719 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -237,7 +237,7 @@ sub add_form { $template->param( module => $module, branchloop => _branchloop($branchcode), - SQLfieldname => $field_selection, + SQLfieldnames => $field_selection, ); return; } -- 2.39.5