diff options
| author | ivan <ivan> | 2007-08-02 19:56:20 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2007-08-02 19:56:20 +0000 |
| commit | 9509e5bfb7f9331303153cac24d7bfecbe2ea9f1 (patch) | |
| tree | 7ff1dce47668339f41f0ddea0e31e85d7788d4df /rt/lib/RT/Links_Overlay.pm | |
| parent | b052ee7b17d87c95f650857989b33ecffc9089c5 (diff) | |
| parent | ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r5562,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/lib/RT/Links_Overlay.pm')
| -rw-r--r-- | rt/lib/RT/Links_Overlay.pm | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/rt/lib/RT/Links_Overlay.pm b/rt/lib/RT/Links_Overlay.pm index 203b60a9e..bf95e6326 100644 --- a/rt/lib/RT/Links_Overlay.pm +++ b/rt/lib/RT/Links_Overlay.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 or visit their web page on the internet at +# http://www.gnu.org/copyleft/gpl.html. # # # CONTRIBUTION SUBMISSION POLICY: @@ -43,7 +45,6 @@ # those contributions and any derivatives thereof. # # END BPS TAGGED BLOCK }}} - =head1 NAME RT::Links - A collection of Link objects @@ -154,19 +155,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; } } |