[Rt-commit] rt branch, 4.0/extensible-ticketsql-cf-limits, updated. rt-4.0.13-99-gc595f3f

[Thomas Sibley]

The branch, 4.0/extensible-ticketsql-cf-limits has been updated
       via  c595f3f967e9de720d130527ddbf81d2c90f0647 (commit)
      from  ef1eae9b27d1f0e2e94bd4cfc357602257b7aae1 (commit)

Summary of changes:
 lib/RT/Tickets.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit c595f3f967e9de720d130527ddbf81d2c90f0647
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue Jul 2 14:34:17 2013 -0700

    Error checking after calling JOIN_ALIAS_FOR_LOOKUP_TYPE callback

diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 3b614e6..25075da 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1399,9 +1399,13 @@ sub _CustomFieldJoin {
     }
 
     my $ObjectAlias = $JOIN_ALIAS_FOR_LOOKUP_TYPE{$type}
-        ? $JOIN_ALIAS_FOR_LOOKUP_TYPE{$type}->($self)
+        ? eval { $JOIN_ALIAS_FOR_LOOKUP_TYPE{$type}->($self) }
         : die "We don't know how to join on $type";
 
+    if ($@ or not $ObjectAlias) {
+        die "Failed to join for $type CFs", $@ ? ": $@" : "";
+    }
+
     my ($ObjectCFs, $CFs);
     if ( $cfid ) {
         $ObjectCFs = $self->{_sql_object_cfv_alias}{$cfkey} = $self->Join(

-----------------------------------------------------------------------