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

(-)a/C4/AuthoritiesMarc.pm (-1 / +7 lines)
Lines 1415-1420 sub merge { Link Here
1415
    my $authfrom = Koha::Authorities->find($mergefrom);
1415
    my $authfrom = Koha::Authorities->find($mergefrom);
1416
    my $authto = Koha::Authorities->find($mergeto);
1416
    my $authto = Koha::Authorities->find($mergeto);
1417
    my $authtypefrom = $authfrom ? Koha::Authority::Types->find($authfrom->authtypecode) : undef;
1417
    my $authtypefrom = $authfrom ? Koha::Authority::Types->find($authfrom->authtypecode) : undef;
1418
    # If it is a mod ($authfrom == $authto) and there was a change of a heading tag $authtypefrom read from the database is of the current version of the auth rec., which is misleading, so we ignore it
1419
    if ($mergeto && $mergefrom == $mergeto && $MARCfrom && $MARCto &&
1420
        $MARCfrom->field('1..', '2..') && $MARCto->field('1..', '2..') && ($MARCfrom->field('1..', '2..'))[0]->tag ne ($MARCto->field('1..', '2..'))[0]->tag) {
1421
	undef $authtypefrom;
1422
	undef $authfrom;
1423
    }
1424
1418
    my $authtypeto   = $authto ? Koha::Authority::Types->find($authto->authtypecode) : undef;
1425
    my $authtypeto   = $authto ? Koha::Authority::Types->find($authto->authtypecode) : undef;
1419
    my $auth_tag_to_report_from = $authtypefrom ? $authtypefrom->auth_tag_to_report : '';
1426
    my $auth_tag_to_report_from = $authtypefrom ? $authtypefrom->auth_tag_to_report : '';
1420
    my $auth_tag_to_report_to   = $authtypeto ? $authtypeto->auth_tag_to_report : '';
1427
    my $auth_tag_to_report_to   = $authtypeto ? $authtypeto->auth_tag_to_report : '';
1421
- 

Return to bug 19693