From 791e222220445e0f6e618dce65fa33aec858d577 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 4 Jun 2015 12:47:13 +0200 Subject: [PATCH] [Signed-off] Bug 14330: Remove unused email_sender from sendbasket/sendshelf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sendbasket/sendshelf scripts and templates do not use email_sender as a cgi parameter or as a template var. Probably a leftover from previous changes. Let's make Koha cleaner :) Test plan: [1] Send your cart from opac or staff. [2] Send a shelf from opac or staff. [3] Git grep email_sender. No results. Followed test plan. Works as expected. Signed-off-by: Marc Véron --- basket/sendbasket.pl | 2 -- opac/opac-sendbasket.pl | 2 -- opac/opac-sendshelf.pl | 1 - virtualshelves/sendshelf.pl | 1 - 4 files changed, 6 deletions(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 71516a4..673842e 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -46,7 +46,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( my $bib_list = $query->param('bib_list'); my $email_add = $query->param('email_add'); -my $email_sender = $query->param('email_sender'); my $dbh = C4::Context->dbh; @@ -101,7 +100,6 @@ if ( $email_add ) { my $resultsarray = \@results; $template2->param( BIBLIO_RESULTS => $resultsarray, - email_sender => $email_sender, comment => $comment ); diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index a451866..e035326 100755 --- a/opac/opac-sendbasket.pl +++ b/opac/opac-sendbasket.pl @@ -49,7 +49,6 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user ( my $bib_list = $query->param('bib_list'); my $email_add = $query->param('email_add'); -my $email_sender = $query->param('email_sender'); my $dbh = C4::Context->dbh; @@ -117,7 +116,6 @@ if ( $email_add ) { $template2->param( BIBLIO_RESULTS => $resultsarray, - email_sender => $email_sender, comment => $comment, firstname => $user->{firstname}, surname => $user->{surname}, diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl index ed9858b..ae3d6af 100755 --- a/opac/opac-sendshelf.pl +++ b/opac/opac-sendshelf.pl @@ -111,7 +111,6 @@ if ( $email ) { $template2->param( BIBLIO_RESULTS => \@results, - email_sender => $mail{'from'}, comment => $comment, shelfname => $shelf[1], firstname => $user->{firstname}, diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl index 3696ba1..17a7ae7 100755 --- a/virtualshelves/sendshelf.pl +++ b/virtualshelves/sendshelf.pl @@ -108,7 +108,6 @@ if ($email) { $template2->param( BIBLIO_RESULTS => \@results, - email_sender => $mail{'from'}, comment => $comment, shelfname => $shelf[1], ); -- 1.7.10.4