Merge branch 'fix-adminProduct'

This commit is contained in:
Marion Muszynski 2016-09-22 10:22:37 +02:00
commit 0a542f0944

View File

@ -4476,12 +4476,12 @@ class AdminProducts extends AdminTab
return $trad[$key];
}
public function getFieldValue($obj, $data, $id_lang = 0) {
public function getFieldValue($obj, $data, $id_lang) {
global $cookie;
if ($id_lang == 0) {
$id_lang = (int)($cookie->id_lang);
}
// if ($id_lang == 0) {
// $id_lang = (int)($cookie->id_lang);
// }
$customs_data = Db::getInstance()->getRow('
SELECT `nc8`, `id_country`