[Rt-commit] r18756 - rt/3.999/trunk/lib/RT

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Tue Mar 10 05:11:33 2009
New Revision: 18756

Modified:
   rt/3.999/trunk/lib/RT/HasRoleGroups.pm

Log:
let add_watcher support local email too

Modified: rt/3.999/trunk/lib/RT/HasRoleGroups.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/HasRoleGroups.pm	(original)
+++ rt/3.999/trunk/lib/RT/HasRoleGroups.pm	Tue Mar 10 05:11:33 2009
@@ -92,13 +92,18 @@
 #XXX: check if role is valid
 
     if ( $args{'email'} ) {
-        my $user = RT::Model::User->new;
-        $user->load_by_email( $args{'email'} );
-        if ( $user->id ) {
-            $args{'principal_id'} = $user->id;
-            delete $args{'email'};
-        } else {
-            delete $args{'principal_id'};
+        my ( $addr ) = RT::EmailParser->parse_email_address( $args{email} );
+        if ($addr) {
+            $args{'email'} = $addr->address;
+            my $user = RT::Model::User->new;
+            $user->load_by_email( $args{'email'} );
+            if ( $user->id ) {
+                $args{'principal_id'} = $user->id;
+                delete $args{'email'};
+            }
+            else {
+                delete $args{'principal_id'};
+            }
         }
     }