From 1fe456ce71d580bfe773ed6106401cb42d8ac318 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Wed, 11 Jul 2012 12:17:21 +0000
Subject: [PATCH] [-] BO : BugFix : #PSCFV-3031 : Unable to edit categories
 from the list

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

diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 79c90015c..ae2242c40 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -106,7 +106,7 @@ class AdminCategoriesControllerCore extends AdminController
 		if (Shop::isFeatureActive() && Shop::getContext() != Shop::CONTEXT_SHOP)
 			unset($this->fields_list['position']);
 		// shop restriction : if category is not available for current shop, we redirect to the list from default category
-		if (!$this->_category->isAssociatedToShop())
+		if (!$this->_category->isAssociatedToShop() && Shop::getContext() == Shop::CONTEXT_SHOP)
 		{
 			$this->redirect_after = self::$currentIndex.'&id_category='.(int)$this->context->shop->getCategory().'&token='.$this->token;
 			$this->redirect();