RT 3.8.17

[freeside.git] / rt / lib / RT / Ticket_Overlay.pm

diff --git a/rt/lib/RT/Ticket_Overlay.pm b/rt/lib/RT/Ticket_Overlay.pm
index bb7cf90..64cf2e7 100644 (file)
--- a/rt/lib/RT/Ticket_Overlay.pm
+++ b/rt/lib/RT/Ticket_Overlay.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -451,6 +451,8 @@ sub Create {
         }
     }
 
+    $args{'Subject'} =~ s/\n//g;
+
     $RT::Handle->BeginTransaction();
 
     my %params = (
@@ -1861,6 +1863,13 @@ sub QueueObj {
     return ($queue_obj);
 }
 
+sub SetSubject {
+    my $self = shift;
+    my $value = shift;
+    $value =~ s/\n//g;
+    return $self->_Set( Field => 'Subject', Value => $value );
+}
+
 # }}}
 
 # }}}
@@ -2315,28 +2324,18 @@ sub _Links {
         return $links;
     }
 
-    # without this you will also get RT::User(s) instead of tickets!
-    if ($field == 'Base' and $type == 'MemberOf') {
-        my $rtname = RT->Config->Get('rtname');
-        $links->Limit(
-                       FIELD    => 'Base',
-                       OPERATOR => 'STARTSWITH',
-                       VALUE    => "fsck.com-rt://$rtname/ticket/",
-                     );
-    }
-
     # Maybe this ticket is a merge ticket
     #my $limit_on = 'Local'. $field;
     # 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;