View | Details | Raw Unified | Return to bug 13215
Collapse All | Expand All

(-)a/tools/letter.pl (-2 / +7 lines)
Lines 254-265 sub add_validate { Link Here
254
        my $title   = shift @title;
254
        my $title   = shift @title;
255
        my $content = shift @content;
255
        my $content = shift @content;
256
        my $letter = C4::Letters::getletter( $oldmodule, $code, $branchcode, $mtt);
256
        my $letter = C4::Letters::getletter( $oldmodule, $code, $branchcode, $mtt);
257
258
        # getletter can return the default letter even if we pass a branchcode
259
        # If we got the default one and we needed the specific one, we didn't get the one we needed!
260
        if ( $letter and $branchcode ne $letter->{branchcode} ) {
261
            $letter = undef;
262
        }
257
        unless ( $title and $content ) {
263
        unless ( $title and $content ) {
258
            # Delete this mtt if no title or content given
264
            # Delete this mtt if no title or content given
259
            delete_confirmed( $branchcode, $oldmodule, $code, $mtt );
265
            delete_confirmed( $branchcode, $oldmodule, $code, $mtt );
260
            next;
266
            next;
261
        }
267
        }
262
        elsif ( $letter->{message_transport_type} eq $mtt ) {
268
        elsif ( $letter and $letter->{message_transport_type} eq $mtt ) {
263
            $dbh->do(
269
            $dbh->do(
264
                q{
270
                q{
265
                    UPDATE letter
271
                    UPDATE letter
266
- 

Return to bug 13215