From fe5348625bc88204987d6b4f794d03e96024b659 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Tue, 22 Nov 2011 09:17:32 +0000 Subject: [PATCH] // Fixed redirect link after logout --- 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 : '');