From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 17 Jun 2013 13:09:37 +0000 (+0200)
Subject: Revert von a3ae31c und 6737607
X-Git-Tag: release-3.1.0beta1~313
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=c7f211c743829e058b9e8ddf8e30428c934a433b;p=kivitendo-erp.git

Revert von a3ae31c und 6737607

Leider verhindert der auch, dass die Upgrades angewendet werden...
---

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index 85a4672a6..4e46e9879 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -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');
 }