dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// now custom_form smarty var can be empty in subtab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10197 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-17 09:08:23 +00:00
parent 68f2cb80fb
commit 38f3940d18
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+3 -2
View File
@@ -1816,7 +1816,7 @@ if (false)
$this->{'initForm'.$this->action}($this->object, $languages, $defaultLanguage); $this->{'initForm'.$this->action}($this->object, $languages, $defaultLanguage);
$this->tpl_form_vars['product'] = $this->object; $this->tpl_form_vars['product'] = $this->object;
if ($this->ajax) 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); throw new PrestashopException('custom_form empty for action '.$this->action);
else else
return $this->tpl_form_vars['custom_form']; return $this->tpl_form_vars['custom_form'];
@@ -3160,7 +3160,8 @@ if (false)
{ {
if (!Feature::isFeatureActive()) if (!Feature::isFeatureActive())
{ {
$this->content .= $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>'); $this->tpl_form_vars['custom_form'] = '';
$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; return;
} }