This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / FS / FS / otaker_Mixin.pm

diff --git a/FS/FS/otaker_Mixin.pm b/FS/FS/otaker_Mixin.pm
index ca17018..071958c 100644 (file)
--- a/FS/FS/otaker_Mixin.pm
+++ b/FS/FS/otaker_Mixin.pm
@@ -9,12 +9,8 @@ sub otaker {
   my $self = shift;
   if ( scalar(@_) ) { #set
     my $otaker = shift;
-    my $access_user = qsearchs('access_user', { 'username' => $otaker } );
-    if ( !$access_user && $otaker =~ /^(.+), (.+)$/ ) { #same as below..
-      $otaker = lc($2.$1);
-      $access_user = qsearchs('access_user', { 'username' => $otaker } );
-    }
-    croak "can't set otaker: $otaker not found!" unless $access_user; #confess?
+    my $access_user = qsearchs('access_user', { 'username' => $otaker } )
+      or croak "can't set otaker: $otaker not found!"; #confess?
     $self->usernum( $access_user->usernum );
     $otaker; #not sure return is used anywhere, but just in case
   } else { #get
@@ -48,12 +44,8 @@ sub _upgrade_otaker {
     foreach my $record (@records) {
       eval { $record->otaker($record->otaker) };
       if ( $@ ) {
-        my $username = $record->otaker;
-        if ( $username =~ /^(.+), (.+)$/ ) {
-          $username = lc($2.$1);
-        }
         my $access_user = new FS::access_user {
-          'username'  => $username,
+          'username'  => $record->otaker,
           '_password' => 'CHANGEME',
           'first'     => 'Legacy',
           'last'      => 'User',