Bugzilla – Attachment 102699 Details for
Bug 25107
Remove double passing of $server variable to maybe_add in C4::SIP::Sip::MsgType
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25107: Remove double passing of $server variable to maybe_add in C4::SIP::Sip::MsgType
Bug-25107-Remove-double-passing-of-server-variable.patch (text/plain), 7.42 KB, created by
Kyle M Hall (khall)
on 2020-04-10 10:59:33 UTC
(
hide
)
Description:
Bug 25107: Remove double passing of $server variable to maybe_add in C4::SIP::Sip::MsgType
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2020-04-10 10:59:33 UTC
Size:
7.42 KB
patch
obsolete
>From 2e0e0fa02cd1789ae323648c914fe082dab097db Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 10 Apr 2020 06:58:43 -0400 >Subject: [PATCH] Bug 25107: Remove double passing of $server variable to > maybe_add in C4::SIP::Sip::MsgType > >At some point some calls to maybe_add got an extra $server var in their parameter lists. This doubled parameter does nothing and should be removed. > >Test Plan: No change in behavior should be noted >--- > C4/SIP/Sip/MsgType.pm | 30 +++++++++++++++--------------- > 1 file changed, 15 insertions(+), 15 deletions(-) > >diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm >index 3a3ea840a4..37af8a67c4 100644 >--- a/C4/SIP/Sip/MsgType.pm >+++ b/C4/SIP/Sip/MsgType.pm >@@ -453,7 +453,7 @@ sub build_patron_status { > > my $msg = $patron->screen_msg; > $msg .= ' -- '. INVALID_PW if $patron_pwd && !$password_rc; >- $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server ); > > $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server ) > if ( $server->{account}->{send_patron_home_library_in_af} ); >@@ -476,7 +476,7 @@ sub build_patron_status { > ( $protocol_version >= 2 ) > and $resp .= add_field( FID_VALID_PATRON, 'N', $server ); > >- $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server ); > } > > $resp .= add_field( FID_INST_ID, $fields->{ (FID_INST_ID) }, $server ); >@@ -561,7 +561,7 @@ sub handle_checkout { > $resp .= add_field( FID_DUE_DATE, q{}, $server ); > } > >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > if ( $protocol_version >= 2 ) { >@@ -592,7 +592,7 @@ sub handle_checkout { > # it's not due, so leave the date blank > $resp .= add_field( FID_DUE_DATE, '', $server ); > >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > if ( $protocol_version >= 2 ) { >@@ -1021,7 +1021,7 @@ sub handle_patron_info { > if( defined( $patron_pwd ) && !$password_rc ) { > $msg .= ' -- ' . INVALID_PW; > } >- $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $msg, $server ); > if ( $server->{account}->{send_patron_home_library_in_af} ) { > $resp .= maybe_add( FID_SCREEN_MSG, $patron->{branchcode}, $server); > } >@@ -1045,7 +1045,7 @@ sub handle_patron_info { > if ( $protocol_version >= 2 ) { > $resp .= add_field( FID_VALID_PATRON, 'N', $server ); > } >- $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, INVALID_CARD, $server ); > } > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1072,7 +1072,7 @@ sub handle_end_patron_session { > $resp .= add_field( FID_INST_ID, $server->{ils}->institution, $server ); > $resp .= add_field( FID_PATRON_ID, $fields->{ (FID_PATRON_ID) }, $server ); > >- $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1150,7 +1150,7 @@ sub handle_fee_paid { > $resp .= add_field( FID_INST_ID, $inst_id, $server ); > $resp .= add_field( FID_PATRON_ID, $patron_id, $server ); > $resp .= maybe_add( FID_TRANSACTION_ID, $status->transaction_id, $server ); >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1220,7 +1220,7 @@ sub handle_item_information { > $resp .= add_field( FID_HOLD_PICKUP_DATE, timestamp($i), $server ); > } > >- $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $item->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $item->print_line, $server ); > } > >@@ -1271,7 +1271,7 @@ sub handle_item_status_update { > $resp .= maybe_add( FID_ITEM_PROPS, $item->sip_item_properties, $server ); > } > >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1320,7 +1320,7 @@ sub handle_patron_enable { > $resp .= add_field( FID_VALID_PATRON_PWD, sipbool( $patron->check_password($patron_pwd) ), $server ); > } > $resp .= add_field( FID_VALID_PATRON, 'Y', $server ); >- $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $patron->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $patron->print_line, $server ); > } > >@@ -1386,7 +1386,7 @@ sub handle_hold { > } > > $resp .= add_field( FID_INST_ID, $ils->institution, $server ); >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1471,7 +1471,7 @@ sub handle_renew { > } > > $resp .= add_field( FID_INST_ID, $ils->institution, $server ); >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1522,7 +1522,7 @@ sub handle_renew_all { > $resp .= join( '', map( add_field( FID_RENEWED_ITEMS, $_ ), @renewed ), $server ); > $resp .= join( '', map( add_field( FID_UNRENEWED_ITEMS, $_ ), @unrenewed ), $server ); > >- $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server, $server ); >+ $resp .= maybe_add( FID_SCREEN_MSG, $status->screen_msg, $server ); > $resp .= maybe_add( FID_PRINT_LINE, $status->print_line, $server ); > > $self->write_msg( $resp, undef, $server->{account}->{terminator}, $server->{account}->{encoding} ); >@@ -1614,7 +1614,7 @@ sub send_acs_status { > $msg .= add_field( FID_SUPPORTED_MSGS, $supported_msgs, $server ); > } > >- $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server, $server ); >+ $msg .= maybe_add( FID_SCREEN_MSG, $screen_msg, $server ); > > if ( defined( $account->{print_width} ) > && defined($print_line) >-- >2.24.1 (Apple Git-126)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 25107
:
102699
|
103832
|
104187