diff options
| -rwxr-xr-x | LedgerSMB/Form.pm | 2 | ||||
| -rwxr-xr-x | bin/login.pl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm index ae67080c..300d0e13 100755 --- a/LedgerSMB/Form.pm +++ b/LedgerSMB/Form.pm @@ -299,7 +299,7 @@ sub redirect { my ($self, $msg) = @_; use List::Util qw(first); - if ($self->{callback}) { + if ($self->{callback} || !$msg) { main::redirect(); } else { diff --git a/bin/login.pl b/bin/login.pl index 22f32290..40f0a10c 100755 --- a/bin/login.pl +++ b/bin/login.pl @@ -348,10 +348,10 @@ sub login { sub logout { - undef $form->{callback}; + $form->{callback} = ""; $form->{endsession} = 1; Session::session_destroy($form); - $form->redirect; + $form->redirect; } |