import torrus 1.0.9

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

diff --git a/FS/FS/CurrentUser.pm b/FS/FS/CurrentUser.pm
index a2dfd71..bcd337d 100644 (file)
--- a/FS/FS/CurrentUser.pm
+++ b/FS/FS/CurrentUser.pm
@@ -22,7 +22,7 @@ sub load_user {
   my( $class, $user ) = @_; #, $pass
 
   if ( $upgrade_hack ) {
-    return new FS::CurrentUser::BootstrapUser;
+    return $CurrentUser = new FS::CurrentUser::BootstrapUser;
   }
 
   #return "" if $user =~ /^fs_(queue|selfservice)$/;
@@ -36,6 +36,7 @@ sub load_user {
   $CurrentUser = qsearchs('access_user', {
     'username' => $user,
     #'_password' =>
+    'disabled' => '',
   } );
 
   die "unknown user: $user" unless $CurrentUser; # or bad password