From 38f3940d18b44bcd14b2839fb889b6a61a1bc5c2 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Thu, 17 Nov 2011 09:08:23 +0000 Subject: [PATCH] // now custom_form smarty var can be empty in subtab git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10197 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminProductsController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 31d488fae..e8f17b9e7 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -1816,7 +1816,7 @@ if (false) $this->{'initForm'.$this->action}($this->object, $languages, $defaultLanguage); $this->tpl_form_vars['product'] = $this->object; if ($this->ajax) - if (empty($this->tpl_form_vars['custom_form'])) + if (!isset($this->tpl_form_vars['custom_form'])) throw new PrestashopException('custom_form empty for action '.$this->action); else return $this->tpl_form_vars['custom_form']; @@ -3160,7 +3160,8 @@ if (false) { if (!Feature::isFeatureActive()) { - $this->content .= $this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').' '.$this->l('Performances').''); + $this->tpl_form_vars['custom_form'] = ''; + $this->displayWarning($this->l('This feature has been disabled, you can active this feature at this page:').' '.$this->l('Performances').''); return; }