From 28a95c3dd0a73717067f793c208d529250c8d212 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Thu, 5 Jul 2012 09:46:12 +0000
Subject: [PATCH] [-] BO : fix #PSCFV-2883

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16230 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminProductsController.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index ec51fe61d..09d20fc01 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3326,16 +3326,11 @@ class AdminProductsControllerCore extends AdminController
 
 	public function initFormAttributes($product)
 	{
+		$data = $this->createTemplate($this->tpl_form);
 		if (!Combination::isFeatureActive())
-		{
 			$this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').
 				' <a href="index.php?tab=AdminPerformance&token='.Tools::getAdminTokenLite('AdminPerformance').'#featuresDetachables">'.$this->l('Performances').'</a>');
-			return;
-		}
-
-		$data = $this->createTemplate($this->tpl_form);
-
-		if (Validate::isLoadedObject($product))
+		else if (Validate::isLoadedObject($product))
 		{
 			if ($product->is_virtual)
 			{