Attachment 60977 Details for Bug 17970 – Bug 17970: Fix GetPreparedLetter behavior if nothing to substitute

[patch] Bug 17970: Fix GetPreparedLetter behavior if nothing to substitute

Bug-17970-Fix-GetPreparedLetter-behavior-if-nothin.patch (text/plain), 2.05 KB, created by Marcel de Rooy on 2017-03-10 08:38:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-03-10 08:38:57 UTC

Size: 2.05 KB

patch

obsolete

>From 6e221bedc939d20802f903ee6be79b5b08b2a477 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Sat, 21 Jan 2017 14:13:49 +0100
>Subject: [PATCH] Bug 17970: Fix GetPreparedLetter behavior if nothing to
> substitute
>Content-Type: text/plain; charset=utf-8
>
>From C4::Letters::GetPreparedLetter:
>
>    my $tables = $params{tables};
>    my $substitute = $params{substitute};
>
>    $tables || $substitute || $repeat
>       or carp( "ERROR: nothing to substitute - both 'tables' and 'substitute' are empty" ),
>          return;
>
>So if the parameter tables or substitute is passed but does not contain anything, it will not warn as expected.
>
>Test plan:
>1/ Apply the patch with tests
>2/ Confirm that they do not pass
>3/ Apply this patch
>4/ Confirm that the tests now pass
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/Letters.pm | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index cf64147..a02085f 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -689,15 +689,15 @@ sub GetPreparedLetter {
>         or warn( "No $module $letter_code letter transported by " . $mtt ),
>             return;
> 
>-    my $tables = $params{tables};
>-    my $substitute = $params{substitute};
>+    my $tables = $params{tables} || {};
>+    my $substitute = $params{substitute} || {};
>     my $repeat = $params{repeat};
>-    $tables || $substitute || $repeat
>+    %$tables || %$substitute || $repeat
>       or carp( "ERROR: nothing to substitute - both 'tables' and 'substitute' are empty" ),
>          return;
>     my $want_librarian = $params{want_librarian};
> 
>-    if ($substitute) {
>+    if (%$substitute) {
>         while ( my ($token, $val) = each %$substitute ) {
>             if ( $token eq 'items.content' ) {
>                 $val =~ s|\n|<br/>|g if $letter->{is_html};
>@@ -743,7 +743,7 @@ sub GetPreparedLetter {
>         }
>     }
> 
>-    if ($tables) {
>+    if (%$tables) {
>         _substitute_tables( $letter, $tables );
>     }
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17970: 59422 | 59423 | 59424 | 59425 | 59481 | 59482 | 60976 | 60977