merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237

1 files changed, 8 insertions, 20 deletions

diff --git a/rt/lib/RT/ScripConditions.pm b/rt/lib/RT/ScripConditions.pm
index 9555e22f0..dc97a1636 100755
--- a/rt/lib/RT/ScripConditions.pm
+++ b/rt/lib/RT/ScripConditions.pm
@@ -70,41 +70,29 @@ package RT::ScripConditions;
 use strict;
 use warnings;
 
+use base 'RT::SearchBuilder';
 
 use RT::ScripCondition;
 
-use base 'RT::SearchBuilder';
-
 sub Table { 'ScripConditions'}
 
 sub LimitToType  {
   my $self = shift;
   my $type = shift;
   $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "$type")
+                FIELD => 'Type',
+                VALUE => "$type")
       if defined $type;
   $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => "Correspond")
+                FIELD => 'Type',
+                VALUE => "Correspond")
       if $type eq "Create";
   $self->Limit (ENTRYAGGREGATOR => 'OR',
-		FIELD => 'Type',
-		VALUE => 'any');
-  
-}
-
+                FIELD => 'Type',
+                VALUE => 'any');
 
-=head2 NewItem
-
-Returns an empty new RT::ScripCondition item
-
-=cut
-
-sub NewItem {
-    my $self = shift;
-    return(RT::ScripCondition->new($self->CurrentUser));
 }
+
 RT::Base->_ImportOverlays();
 
 1;