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

[-] BO : #PSTEST-401 - Bug Fixed in SVN

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12322 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mBertholino
2012-01-10 16:27:22 +00:00
parent cc39c8fe15
commit 6c6aeb7aed
12 changed files with 731 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+3 -3
View File
@@ -1464,7 +1464,7 @@ class ProductCore extends ObjectModel
* @param integer $id_product_attribute Product attribute id
* @return array Deletion result
*/
public function deleteAttributeCombinaison($id_product_attribute)
public function deleteAttributeCombination($id_product_attribute)
{
if (!$this->id || !$id_product_attribute || !is_numeric($id_product_attribute))
return false;
@@ -1570,7 +1570,7 @@ class ProductCore extends ObjectModel
* @param integer $id_lang Language id
* @return array Product attributes combinaisons
*/
public function getAttributeCombinaisons($id_lang)
public function getAttributeCombinations($id_lang)
{
if (!Combination::isFeatureActive())
return array();
@@ -1612,7 +1612,7 @@ class ProductCore extends ObjectModel
* @param integer $id_lang Language id
* @return array Product attribute combinaison by id_product_attribute
*/
public function getAttributeCombinaisonsById($id_product_attribute, $id_lang)
public function getAttributeCombinationsById($id_product_attribute, $id_lang)
{
if (!Combination::isFeatureActive())
return array();