Revert von a3ae31c und 6737607
authorMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 13:09:37 +0000 (15:09 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Mon, 17 Jun 2013 13:09:37 +0000 (15:09 +0200)
Leider verhindert der auch, dass die Upgrades angewendet werden...

SL/Controller/Admin.pm

index 85a4672..4e46e98 100644 (file)
@@ -37,11 +37,11 @@ sub keep_auth_vars {
 sub action_login {
   my ($self) = @_;
 
-  return $self->redirect_to(action => 'show') if  $::auth->authenticate_root == SL::Auth::OK();
-  return $self->login_form                    if !$::form->{do_login};
-  return                                      if !$self->authenticate_root;
-  return                                      if !$self->check_auth_db_and_tables;
-  return                                      if  $self->apply_dbupgrade_scripts;
+  return $self->login_form if !$::form->{do_login};
+  return                   if !$self->authenticate_root;
+  return                   if !$self->check_auth_db_and_tables;
+  return                   if  $self->apply_dbupgrade_scripts;
+
   $self->redirect_to(action => 'show');
 }