From 2e25835e7c01e639947c796e36e5e94896165671 Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Tue, 21 Nov 2006 00:44:40 +0000
Subject: Fixing logout bug.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@666 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/Form.pm | 2 +-
 bin/login.pl      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index dd3db02c..1dee7692 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -307,7 +307,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 d807ed26..11a5e82a 100755
--- a/bin/login.pl
+++ b/bin/login.pl
@@ -348,7 +348,7 @@ sub login {
 
 
 sub logout {
-	$form->{callback} = "$form->{script}?path=$form->{path}&login=$form->{login}";
+	$form->{callback} = "";
 	$form->{endsession} = 1;
 	Session::session_destroy($form);
 	$form->redirect;
-- 
cgit v1.2.3