From ed19c60ff805598f109c9227e23fcfdc7b33a547 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Tue, 22 Nov 2011 09:17:32 +0000
Subject: [PATCH] // Fixed redirect link after logout

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10385 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/AdminController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/AdminController.php b/classes/AdminController.php
index cafa336b2..f116d6748 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1595,7 +1595,7 @@ class AdminControllerCore extends Controller
 			$this->context->employee->logout();
 
 		if (!isset($this->context->employee) || !$this->context->employee->isLoggedBack())
-			$this->redirect_after = 'login.php?redirect='.$_SERVER['REQUEST_URI'];
+			$this->redirect_after = 'login.php'.(!isset($_GET['logout']) ? '?redirect='.$_SERVER['REQUEST_URI'] : '');
 
 		// Set current index
 		$current_index = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller : '');