rt/zephyr-scrip.pl: Display the correct ticket for merge notifications.

[Scripts/git/.git] / rt / zephyr-scrip.pl

diff --git a/rt/zephyr-scrip.pl b/rt/zephyr-scrip.pl
index 5a23cdf8b19cad7541d4de974bc88b4fda37f3ae..15f797b80313b7fea5b3a55a024876f6e2b80ed9 100644 (file)
--- a/rt/zephyr-scrip.pl
+++ b/rt/zephyr-scrip.pl
@@ -3,7 +3,7 @@ my $instance_prefix = 'rt.';
 my @zwrite = ('/usr/athena/bin/zwrite', '-d', '-O', 'auto', '-c', $class);
 
 # RT-to-Zephyr notification scrip
-# http://snippets.scripts.mit.edu/gitweb.cgi/.git/tree/HEAD:/rt/zephyr-scrip.pl
+# http://snippets.scripts.mit.edu/gitweb.cgi/.git/blob/HEAD:/rt/zephyr-scrip.pl
 #
 # Copyright © 2010 Anders Kaseorg <andersk@mit.edu>
 #
@@ -45,9 +45,9 @@ local $SIG{__DIE__} = sub {
     send_notice "${instance_prefix}error", "Internal error in Zephyr scrip:\n$err";
 };
 
-(my $id = $self->TicketObj->id) =~ s/@/@@/g;
+(my $id = $self->TransactionObj->Ticket) =~ s/@/@@/g;
 (my $description = $self->TransactionObj->Description) =~ s/@/@@/g;
-(my $subject = $self->TicketObj->Subject) =~ s/@/@@/g;
+(my $subject = $self->TransactionObj->TicketObj->Subject) =~ s/@/@@/g;
 
 send_notice "$instance_prefix$id", $description, $subject;
 1;