From: Ivan Kohler <ivan@freeside.biz>
Date: Tue, 2 Sep 2014 22:22:56 +0000 (-0700)
Subject: Merge branch 'h_cust_main_index_fix' of https://github.com/Jayceh/Freeside
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=8898636630e25444096c4bcef012c5a31701756d;hp=cbbf889d1f250c377d2b3c4b020bf78e66ed1190;p=freeside.git

Merge branch 'h_cust_main_index_fix' of https://github.com/Jayceh/Freeside
---

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