Clean code
This commit is contained in:
parent
c6b404ad7f
commit
144a56d073
@ -2496,12 +2496,12 @@ class Form
|
|||||||
$soc = new Societe($db);
|
$soc = new Societe($db);
|
||||||
$result = $soc->fetch($socid);
|
$result = $soc->fetch($socid);
|
||||||
if ($result > 0 && !empty($soc->default_lang)) {
|
if ($result > 0 && !empty($soc->default_lang)) {
|
||||||
$sql .= " AND pl.lang='" . $this->db->escape($soc->default_lang) . "'";
|
$sql .= " AND pl.lang = '".$this->db->escape($soc->default_lang)."'";
|
||||||
} else {
|
} else {
|
||||||
$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$sql .= " AND pl.lang='".$this->db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND pl.lang = '".$this->db->escape($langs->getDefaultLang())."'";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -812,8 +812,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
|
|||||||
// TODO Use a cache here
|
// TODO Use a cache here
|
||||||
$sql = "SELECT label";
|
$sql = "SELECT label";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
||||||
$sql .= " WHERE fk_product=".$objp->rowid;
|
$sql .= " WHERE fk_product = ".((int) $objp->rowid);
|
||||||
$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
|
||||||
$sql .= " LIMIT 1";
|
$sql .= " LIMIT 1";
|
||||||
|
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
|
|||||||
@ -342,8 +342,8 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
|
|||||||
if (!empty($conf->global->MAIN_MULTILANGS)) {
|
if (!empty($conf->global->MAIN_MULTILANGS)) {
|
||||||
$sql = "SELECT label";
|
$sql = "SELECT label";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
||||||
$sql .= " WHERE fk_product=".((int) $objp->rowid);
|
$sql .= " WHERE fk_product = ".((int) $objp->rowid);
|
||||||
$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
|
||||||
|
|
||||||
$resultd = $db->query($sql);
|
$resultd = $db->query($sql);
|
||||||
if ($resultd) {
|
if ($resultd) {
|
||||||
|
|||||||
@ -212,7 +212,7 @@ if ($mode && $mode != '-1') {
|
|||||||
$sql = "SELECT label";
|
$sql = "SELECT label";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
||||||
$sql .= " WHERE fk_product = ".((int) $prodid);
|
$sql .= " WHERE fk_product = ".((int) $prodid);
|
||||||
$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
|
||||||
$sql .= " LIMIT 1";
|
$sql .= " LIMIT 1";
|
||||||
|
|
||||||
$resultp = $db->query($sql);
|
$resultp = $db->query($sql);
|
||||||
|
|||||||
@ -1160,8 +1160,8 @@ while ($i < min($num, $limit)) {
|
|||||||
// TODO Use a cache
|
// TODO Use a cache
|
||||||
$sql = "SELECT label";
|
$sql = "SELECT label";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
|
||||||
$sql .= " WHERE fk_product=".$objp->rowid;
|
$sql .= " WHERE fk_product = ".((int) $objp->rowid);
|
||||||
$sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";
|
$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
|
||||||
$sql .= " LIMIT 1";
|
$sql .= " LIMIT 1";
|
||||||
|
|
||||||
$result = $db->query($sql);
|
$result = $db->query($sql);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user