Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/new/bug_7417'

Browse source
This commit is contained in:
Paul Poulain 2012-09-14 17:22:47 +02:00
commit 53e08d9811
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Koha/Authority.pm
View file

@ -77,7 +77,7 @@ sub get_from_authid {
my ($authtypecode, $marcxml) = $sth->fetchrow;
my $record=eval {MARC::Record->new_from_xml(StripNonXmlChars($marcxml),'UTF-8',
(C4::Context->preference("marcflavour") eq "UNIMARC"?"UNIMARCAUTH":C4::Context->preference("marcflavour")))};
return undef if ($@);
return if ($@);
$record->encoding('UTF-8');
my $self = $class->SUPER::new( { authid => $authid,

2
Koha/Filter/MARC/EmbedSeeFromHeadings.pm
View file

@ -54,7 +54,7 @@ sub filter {
my $record = shift;
my $newrecord;
return undef unless defined $record;
return unless defined $record;
if (ref $record eq 'ARRAY') {
my @recarray;