[Rt-commit] r6789 - rt/branches/3.6-RELEASE/lib/RT/Interface

[ruz at bestpractical.com]

Author: ruz
Date: Sat Jan 20 23:50:29 2007
New Revision: 6789

Modified:
   rt/branches/3.6-RELEASE/lib/RT/Interface/Email.pm

Log:
* that was wrong idea to run next mail plugins for some action
  if the current plugin said that everything was done (returned
  status -2).

Modified: rt/branches/3.6-RELEASE/lib/RT/Interface/Email.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/Interface/Email.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/Interface/Email.pm	Sat Jan 20 23:50:29 2007
@@ -645,6 +645,10 @@
             $skip_action{$action}++ if $AuthStat == -2;
         }
 
+        # strip actions we should skip
+        @actions = grep !$skip_action{$_}, @actions if $AuthStat == -2;
+        last unless @actions;
+
         last if $AuthStat == -1;
     }
     # {{{ If authentication fails and no new user was created, get out.
@@ -694,9 +698,6 @@
         return ( 0, $result, undef );
     }
     
-    # strip actions we should skip
-    @actions = grep !$skip_action{$_}, @actions;
-
     # if plugin's updated SystemTicket then update arguments
     $args{'ticket'} = $SystemTicket->Id if $SystemTicket && $SystemTicket->Id;
 
@@ -738,7 +739,7 @@
         @actions = grep !/^(comment|correspond)$/, @actions;
         $args{'ticket'} = $id;
 
-    } else {
+    } elsif ( $args{'ticket'} ) {
 
         $Ticket->Load( $args{'ticket'} );
         unless ( $Ticket->Id ) {
@@ -752,6 +753,9 @@
 
             return ( 0, $error );
         }
+        $args{'ticket'} = $Ticket->id;
+    } else {
+        return ( 1, "Success", $Ticket );
     }
 
     # }}}