From acf95956ea282bd4145536d1dc6b4f015af42bf5 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 9 Jul 2012 22:19:49 -0700 Subject: prevent RT::EmailParser::RescueOutlook from throwing a fatal error.. still better to accept the message anyway, even if it can't be rescued from Outlook --- rt/lib/RT/EmailParser.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm index 4cf4184a4..059a0967a 100644 --- a/rt/lib/RT/EmailParser.pm +++ b/rt/lib/RT/EmailParser.pm @@ -576,7 +576,7 @@ sub RescueOutlook { my $text_part; if ( $mime->head->get('Content-Type') =~ m{multipart/mixed} ) { my $first = $mime->parts(0); - if ( $first->head->get('Content-Type') =~ m{multipart/alternative} ) + if ( $first && $first->head->get('Content-Type') =~ m{multipart/alternative} ) { my $inner_first = $first->parts(0); if ( $inner_first->head->get('Content-Type') =~ m{text/plain} ) @@ -587,7 +587,7 @@ sub RescueOutlook { } elsif ( $mime->head->get('Content-Type') =~ m{multipart/alternative} ) { my $first = $mime->parts(0); - if ( $first->head->get('Content-Type') =~ m{text/plain} ) { + if ( $first && $first->head->get('Content-Type') =~ m{text/plain} ) { $text_part = $first; } } -- cgit v1.2.1 From 35441752ed24a30b2ccba25db4322d9ddbc88f2d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Mon, 9 Jul 2012 22:28:38 -0700 Subject: prevent RT::EmailParser::RescueOutlook from throwing a fatal error.. still better to accept the message anyway, even if it can't be rescued from Outlook --- rt/lib/RT/EmailParser.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rt') diff --git a/rt/lib/RT/EmailParser.pm b/rt/lib/RT/EmailParser.pm index 059a0967a..dd73d9049 100644 --- a/rt/lib/RT/EmailParser.pm +++ b/rt/lib/RT/EmailParser.pm @@ -579,7 +579,7 @@ sub RescueOutlook { if ( $first && $first->head->get('Content-Type') =~ m{multipart/alternative} ) { my $inner_first = $first->parts(0); - if ( $inner_first->head->get('Content-Type') =~ m{text/plain} ) + if ( $inner_first && $inner_first->head->get('Content-Type') =~ m{text/plain} ) { $text_part = $inner_first; } -- cgit v1.2.1 From a6aa4c2a3f8128c26a63314a5ec58c71c494e88e Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 14 Jul 2012 23:19:17 -0700 Subject: really fix phantom customers, really RT#13852 --- rt/lib/RT/Ticket.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rt') diff --git a/rt/lib/RT/Ticket.pm b/rt/lib/RT/Ticket.pm index 6ba6c5bc5..00f88b657 100755 --- a/rt/lib/RT/Ticket.pm +++ b/rt/lib/RT/Ticket.pm @@ -2447,13 +2447,13 @@ sub _Links { # at least to myself $links->Limit( FIELD => $field, #$limit_on, - OPERATOR => 'LIKE', + OPERATOR => 'MATCHES', VALUE => 'fsck.com-rt://%/ticket/'. $self->id, ENTRYAGGREGATOR => 'OR', ); $links->Limit( FIELD => $field, #$limit_on, - OPERATOR => 'LIKE', + OPERATOR => 'MATCHES', VALUE => 'fsck.com-rt://%/ticket/'. $_, ENTRYAGGREGATOR => 'OR', ) foreach $self->Merged; -- cgit v1.2.1