From ccaa0542a0780466a18fdd0c4fef8b38f2428cbd Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Wed, 23 Nov 2011 10:19:27 +0000
Subject: [PATCH] // Configuration feedback is now not displayed when changing
 shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10505 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 5e8ede003..65191d018 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1633,7 +1633,7 @@ class AdminControllerCore extends Controller
 			$url = parse_url($_SERVER['REQUEST_URI']);
 			$query = (isset($url['query'])) ? $url['query'] : '';
 			parse_str($query, $parse_query);
-			unset($parse_query['setShopContext']);
+			unset($parse_query['setShopContext'], $parse_query['conf']);
 			$this->redirect_after = $url['path'].'?'.http_build_query($parse_query);
 		}
 		elseif (!Shop::isFeatureActive())