diff options
| author | ivan <ivan> | 2008-03-03 23:07:58 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-03-03 23:07:58 +0000 |
| commit | 479339313bbda612f8fe939217fd067999ef36d4 (patch) | |
| tree | a47e2fbdc0107910bbbd3b57dc0cbfc357f76aa3 /rt/lib/RT/Links_Overlay.pm | |
| parent | 642d85fc54b066e6364b66644b95c7b123ba8e24 (diff) | |
merge in rt 3.4.6. *gulp*!
Diffstat (limited to 'rt/lib/RT/Links_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Links_Overlay.pm | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/rt/lib/RT/Links_Overlay.pm b/rt/lib/RT/Links_Overlay.pm index 203b60a9e..e1927f842 100644 --- a/rt/lib/RT/Links_Overlay.pm +++ b/rt/lib/RT/Links_Overlay.pm @@ -154,19 +154,17 @@ sub Next { my $self = shift; my $Link = $self->SUPER::Next(); - if ((defined($Link)) and (ref($Link))) { - # Skip links to local objects thast are deleted - if ($Link->TargetURI->IsLocal and UNIVERSAL::isa($Link->TargetObj,"RT::Ticket") - and $Link->TargetObj->__Value('status') eq "deleted") { - return $self->Next; - } elsif ($Link->BaseURI->IsLocal and UNIVERSAL::isa($Link->BaseObj,"RT::Ticket") - and $Link->BaseObj->__Value('status') eq "deleted") { - return $self->Next; - } else { - return $Link; - } + return $Link unless $Link && ref $Link; + + # Skip links to local objects thast are deleted + if ( $Link->TargetURI->IsLocal and UNIVERSAL::isa($Link->TargetObj,"RT::Ticket") + and $Link->TargetObj->__Value('status') eq "deleted") { + return $self->Next; + } elsif ($Link->BaseURI->IsLocal and UNIVERSAL::isa($Link->BaseObj,"RT::Ticket") + and $Link->BaseObj->__Value('status') eq "deleted") { + return $self->Next; } else { - return undef; + return $Link; } } |