From b95c330fd8e0acde52b6743274fa003f821a84ef Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 2 Sep 2014 10:16:12 -0700 Subject: [PATCH] fix new installs vs. FKs, RT#13971 --- FS/FS/Record.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm index 200575612..8f7573443 100644 --- a/FS/FS/Record.pm +++ b/FS/FS/Record.pm @@ -1043,7 +1043,10 @@ sub fk_methods { my $method = ''; if ( scalar( @{$fk->columns} ) == 1 ) { - if ( ! @{$fk->references} || $fk->columns->[0] eq $fk->references->[0] ){ + if ( ! defined($fk->references) + || ! @{$fk->references} + || $fk->columns->[0] eq $fk->references->[0] + ) { $method = $fk->table; } else { #some sort of hint in the table.pm or schema for methods not named @@ -1074,7 +1077,10 @@ sub fk_methods { my $method = ''; if ( scalar( @{$fk->columns} ) == 1 ) { - if ( ! @{$fk->references} || $fk->columns->[0] eq $fk->references->[0] ){ + if ( ! defined($fk->references) + || ! @{$fk->references} + || $fk->columns->[0] eq $fk->references->[0] + ) { $method = $f_table; } else { #some sort of hint in the table.pm or schema for methods not named -- 2.11.0