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

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AttributeGroup.php
+3 -3
View File
@@ -81,7 +81,7 @@ class AttributeGroupCore extends ObjectModel
return parent::getTranslationsFields(array('name', 'public_name'));
}
static public function cleanDeadCombinations()
public static function cleanDeadCombinations()
{
$attributeCombinations = Db::getInstance()->ExecuteS('SELECT pac.`id_attribute`, pa.`id_product_attribute` FROM `'._DB_PREFIX_.'product_attribute` pa LEFT JOIN `'._DB_PREFIX_.'product_attribute_combination` pac ON (pa.`id_product_attribute` = pac.`id_product_attribute`)');
$toRemove = array();
@@ -121,7 +121,7 @@ class AttributeGroupCore extends ObjectModel
* @param boolean $id_attribute_group Attribute group id
* @return array Attributes
*/
static public function getAttributes($id_lang, $id_attribute_group)
public static function getAttributes($id_lang, $id_attribute_group)
{
return Db::getInstance()->ExecuteS('
SELECT *
@@ -137,7 +137,7 @@ class AttributeGroupCore extends ObjectModel
* @param integer $id_lang Language id
* @return array Attributes groups
*/
static public function getAttributesGroups($id_lang)
public static function getAttributesGroups($id_lang)
{
return Db::getInstance()->ExecuteS('
SELECT *