http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=4995
Chris Cormack <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|REOPENED |RESOLVED Patch Status|Needs Signoff |Patch Pushed Resolution| |FIXED --- Comment #5 from Chris Cormack <[email protected]> 2011-07-28 22:12:30 UTC --- It is there in master already, applying the patch causes this conflict <<<<<<< HEAD my @attributes = grep{my $key=$_; any{$_ eq $key}@types;} keys %borrower; my $extended_patron_attributes; @{$extended_patron_attributes} = map { { code => $_, value => $borrower{$_} } } @attributes; ======= my @attributes = grep{my $key=$_; any{$_->{code} eq $key}@types;} keys %borrower; my $extended_patron_attributes = [ map{{code=>$_,value=>$borrower{$_}}}@attributes ]; >>>>>>> Bug 4995 - extended attributes replication from LDAP -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
