[Rt-commit] r6770 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Thu Jan 18 10:55:08 2007
New Revision: 6770

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm

Log:
 r4390 at cubic-pc:  cubic | 2007-01-18 07:33:19 +0300
 Ticket::_AddWatcher
 * get rid of code that duplicates effort with LoadOrCreateByEmail method


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Ticket_Overlay.pm	Thu Jan 18 10:55:08 2007
@@ -1388,14 +1388,8 @@
     my $principal = RT::Principal->new($self->CurrentUser);
     if ($args{'Email'}) {
         my $user = RT::User->new($RT::SystemUser);
-        my ($pid, $msg) = $user->LoadOrCreateByEmail($args{'Email'});
-	# If we can't load the user by email address, let's try to load by username	
-	unless ($pid) { 
-		($pid,$msg) = $user->Load($args{'Email'})
-	}
-        if ($pid) {
-            $args{'PrincipalId'} = $pid; 
-        }
+        my ($pid, $msg) = $user->LoadOrCreateByEmail( $args{'Email'} );
+        $args{'PrincipalId'} = $pid if $pid; 
     }
     if ($args{'PrincipalId'}) {
         $principal->Load($args{'PrincipalId'});