Bug 10807: (follow-up) use 24-hour time when storing search times to session

[koha_fer] / C4 / Letters.pm

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 51020b6..cefe7bd 100644 (file)
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -98,18 +98,17 @@ $template->param(LETTERLOOP => \@letterloop);
 sub GetLetters {
 
     # returns a reference to a hash of references to ALL letters...
-    my ( $cat, $message_transport_type ) = @_;
-    $message_transport_type ||= 'email';
+    my ( $cat ) = @_;
     my %letters;
     my $dbh = C4::Context->dbh;
     my $sth;
     my $query = q{
-        SELECT * FROM letter WHERE
+        SELECT * FROM letter WHERE 1
     };
-    $query .= q{ module = ? AND } if defined $cat;
-    $query .= q{ message_transport_type = ? ORDER BY name};
+    $query .= q{ AND module = ? } if defined $cat;
+    $query .= q{ GROUP BY code ORDER BY name};
     $sth = $dbh->prepare($query);
-    $sth->execute((defined $cat ? $cat : ()), $message_transport_type);
+    $sth->execute((defined $cat ? $cat : ()));
 
     while ( my $letter = $sth->fetchrow_hashref ) {
         $letters{ $letter->{'code'} } = $letter->{'name'};
@@ -452,9 +451,10 @@ sub GetPreparedLetter {
     my $module      = $params{module} or croak "No module";
     my $letter_code = $params{letter_code} or croak "No letter_code";
     my $branchcode  = $params{branchcode} || '';
+    my $mtt         = $params{message_transport_type} || 'email';
 
-    my $letter = getletter( $module, $letter_code, $branchcode, $params{message_transport_type} )
-        or warn( "No $module $letter_code letter"),
+    my $letter = getletter( $module, $letter_code, $branchcode, $mtt )
+        or warn( "No $module $letter_code letter transported by " . $mtt ),
             return;
 
     my $tables = $params{tables};