Attachment 48668 Details for Bug 13871 – Bug 13871: [TITLE_AMENDED] Additional changes

[patch] Bug 13871: [TITLE_AMENDED] Additional changes

Bug-13871-TITLEAMENDED-Additional-changes.patch (text/plain), 1.72 KB, created by Marcel de Rooy on 2016-03-04 10:16:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2016-03-04 10:16:49 UTC

Size: 1.72 KB

patch

obsolete

>From e21dcb16b91c3ac2473a814a504bcf003251700b Mon Sep 17 00:00:00 2001
>From: Mason James <mtj@kohaaloha.com>
>Date: Mon, 23 Mar 2015 14:30:26 +1300
>Subject: [PATCH] Bug 13871: [TITLE_AMENDED] Additional changes
>Content-Type: text/plain; charset=utf-8
>
>The original perltidy patch from Mason has been amended.
>
>The perltidy itself has been moved to a separate patch with the current
>perltidyrc applied.
>
>As noted on Bugzilla, the original perltidy patch included some extra
>changes:
>[1] You prefix timestamp with Sip
>    This is not actually needed (it is imported), but if we should prefix it,
>    we should prefix now with C4::SIP::Sip. But you only changed two
>    occurrences (out of 26). So I remove these two changes.
>[2] You remove the $server parameter from two calls of maybe_add:
>    A closer look at the remaining code tells me that $server is always
>    passed to maybe_add for FID_SCREEN_MSG. So this only left me the
>    current whitespace change.
>But at least we documented what we did or did not, and why..
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/SIP/Sip/MsgType.pm |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm
>index 591db89..b0607df 100644
>--- a/C4/SIP/Sip/MsgType.pm
>+++ b/C4/SIP/Sip/MsgType.pm
>@@ -427,7 +427,7 @@ sub build_patron_status {
>             $resp .= maybe_add( FID_FEE_AMT,  $patron->fee_amount );
>         }
> 
>-        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg,   $server );
>+        $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server );
>         $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server )
>           if ( $server->{account}->{send_patron_home_library_in_af} );
> 
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13871: 37539 | 37543 | 38451 | 38452 | 38453 | 38454 | 38455 | 45645 | 45646 | 45647 | 45648 | 45649 | 48386 | 48387 | 48388 | 48389 | 48390 | 48391 | 48392 | 48393 | 48667 | 48668 | 48669 | 48670 | 48671 | 48672 | 51421 | 51422