[Rt-commit] rt branch, reuse_merged, updated. rt-3.8.6-98-g7ae7fb0

[Ruslan Zakirov]

The branch, reuse_merged has been updated
       via  7ae7fb0db6d0829d904702aff5ad3d1401a9254f (commit)
       via  e46f6978b6464086fced2ebab1077e7faebe23f4 (commit)
      from  d4ed191b704cf494ac459177d90c8b406e302716 (commit)

Summary of changes:
 lib/RT/Ticket_Overlay.pm |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit e46f6978b6464086fced2ebab1077e7faebe23f4
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Nov 18 00:18:00 2009 +0300

    effective id can be zero or undefined on create

diff --git a/lib/RT/Ticket_Overlay.pm b/lib/RT/Ticket_Overlay.pm
index ad25cd8..cf84cb4 100755
--- a/lib/RT/Ticket_Overlay.pm
+++ b/lib/RT/Ticket_Overlay.pm
@@ -181,7 +181,7 @@ sub Load {
     }
 
     #If we're merged, resolve the merge.
-    if ( ($self->EffectiveId || 0) != $self->Id ) {
+    if ( $self->EffectiveId && $self->EffectiveId != $self->Id ) {
         $RT::Logger->debug(
             "We found a merged ticket. "
             . $self->id ."/". $self->EffectiveId

commit 7ae7fb0db6d0829d904702aff5ad3d1401a9254f
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Wed Nov 18 00:59:38 2009 +0300

    drop debug statement

diff --git a/lib/RT/Ticket_Overlay.pm b/lib/RT/Ticket_Overlay.pm
index cf84cb4..1c5190c 100755
--- a/lib/RT/Ticket_Overlay.pm
+++ b/lib/RT/Ticket_Overlay.pm
@@ -2209,7 +2209,6 @@ sub _Links {
     my $cache_key = "$field$type";
     return $self->{ $cache_key } if $self->{ $cache_key };
 
-    $RT::Logger->error( "links field: $field, type: $type" );
     my $links = $self->{ $cache_key }
               = RT::Links->new( $self->CurrentUser );
     unless ( $self->CurrentUserHasRight('ShowTicket') ) {

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