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

// BugFix : undefined var in admin page product + bad ajax return

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9558 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2011-10-21 15:09:15 +00:00
parent 59ebf2b7d0
commit acdb240de4
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
@@ -1527,7 +1527,7 @@ if (false)
$languages = Language::getLanguages(false); $languages = Language::getLanguages(false);
$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT')); $defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
$product = new Product((int)(Tools::getValue('id_product'))); $product = new Product((int)(Tools::getValue('id_product')));
$content .= $this->initForm(); $this->initForm();
return $this->{'initForm'.$this->action}($product, $languages, $defaultLanguage); return $this->{'initForm'.$this->action}($product, $languages, $defaultLanguage);
} }
} }
@@ -1723,6 +1723,7 @@ if (false)
public function displayForm($isMainTab = true) public function displayForm($isMainTab = true)
{ {
$content = '';
parent::displayForm(); parent::displayForm();
if (!($obj = $this->loadObject(true))) if (!($obj = $this->loadObject(true)))
throw new Exception('object not loaded'); throw new Exception('object not loaded');
@@ -3605,7 +3606,7 @@ switch ($this->action)
$stock_available->save(); $stock_available->save();
break; break;
} }
$this->content = Tools::jsonEncode(array('error' => false)); die(Tools::jsonEncode(array('error' => false)));
} }
public function getLineTableImage($image, $imagesTotal, $token, $shops) public function getLineTableImage($image, $imagesTotal, $token, $shops)