Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 14 insertions, 27 deletions

diff --git a/rt/lib/RT/Condition.pm b/rt/lib/RT/Condition.pm
index 80cf01992..69aaf8664 100755
--- a/rt/lib/RT/Condition.pm
+++ b/rt/lib/RT/Condition.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -54,14 +54,14 @@
 
     use RT::Condition;
     my $foo = RT::Condition->new( 
-		TransactionObj => $tr, 
-		TicketObj => $ti, 
-		ScripObj => $scr, 
-		Argument => $arg, 
-		Type => $type);
+                TransactionObj => $tr, 
+                TicketObj => $ti, 
+                ScripObj => $scr, 
+                Argument => $arg, 
+                Type => $type);
 
     if ($foo->IsApplicable) {
- 	   # do something
+           # do something
     }
 
 
@@ -95,14 +95,14 @@ sub new  {
 sub _Init  {
   my $self = shift;
   my %args = ( TransactionObj => undef,
-	       TicketObj => undef,
-	       ScripObj => undef,
-	       TemplateObj => undef,
-	       Argument => undef,
-	       ApplicableTransTypes => undef,
+               TicketObj => undef,
+               ScripObj => undef,
+               TemplateObj => undef,
+               Argument => undef,
+               ApplicableTransTypes => undef,
            CurrentUser => undef,
-	       @_ );
-  
+               @_ );
+
   $self->{'Argument'} = $args{'Argument'};
   $self->{'ScripObj'} = $args{'ScripObj'};
   $self->{'TicketObj'} = $args{'TicketObj'};
@@ -193,19 +193,6 @@ sub IsApplicable  {
   return(undef);
 }
 
-sub Options {
-  my $self = shift;
-  return();
-}
-
-sub Rules {
-  my $self = shift;
-  return () if !$self->ScripObj or !$self->ScripObj->ConditionRules;
-  # By default, option names and values are on consecutive lines.
-  # Override this if you need anything more interesting.
-  return(split "\n", $self->ScripObj->ConditionRules);
-}
-
 sub DESTROY {
     my $self = shift;