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/FeatureValue.php
+5 -5
View File
@@ -81,7 +81,7 @@ class FeatureValueCore extends ObjectModel
* @return array Array with feature's values
* @static
*/
static public function getFeatureValues($id_feature)
public static function getFeatureValues($id_feature)
{
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT *
@@ -97,7 +97,7 @@ class FeatureValueCore extends ObjectModel
* @return array Array with feature's values
* @static
*/
static public function getFeatureValuesWithLang($id_lang, $id_feature)
public static function getFeatureValuesWithLang($id_lang, $id_feature)
{
return Db::getInstance()->ExecuteS('
SELECT *
@@ -114,7 +114,7 @@ class FeatureValueCore extends ObjectModel
* @return array Array with value's languages
* @static
*/
static public function getFeatureValueLang($id_feature_value)
public static function getFeatureValueLang($id_feature_value)
{
return Db::getInstance()->ExecuteS('
SELECT *
@@ -131,14 +131,14 @@ class FeatureValueCore extends ObjectModel
* @return string String value name selected
* @static
*/
static public function selectLang($lang, $id_lang)
public static function selectLang($lang, $id_lang)
{
foreach ($lang as $tab)
if ($tab['id_lang'] == $id_lang)
return $tab['value'];
}
static public function addFeatureValueImport($id_feature, $name)
public static function addFeatureValueImport($id_feature, $name)
{
$rq = Db::getInstance()->ExecuteS('
SELECT fv.`id_feature_value`