clean code (#37947)
* fix categories translations * fix categories translations * fix categories translations * fix categories translations * Update traduction.php * Update traduction.php * Update photos.php * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix categories translations * fix * fix * fix --------- Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
This commit is contained in:
parent
295bbc08ec
commit
9bf8103dad
1 changed files with 10 additions and 6 deletions
|
|
@ -6957,7 +6957,7 @@ abstract class CommonObject
|
|||
*/
|
||||
public function insertExtraFields($trigger = '', $userused = null)
|
||||
{
|
||||
global $langs, $user;
|
||||
global $langs, $extrafields, $user;
|
||||
|
||||
if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED') || empty($this->array_options)) {
|
||||
return 0;
|
||||
|
|
@ -6971,8 +6971,10 @@ abstract class CommonObject
|
|||
|
||||
// Check parameters
|
||||
$langs->load('admin');
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
|
||||
$extrafields = new ExtraFields($this->db);
|
||||
if (!isset($extrafields) || !is_object($extrafields)) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
|
||||
$extrafields = new ExtraFields($this->db);
|
||||
}
|
||||
$target_extrafields = $extrafields->fetch_name_optionals_label($this->table_element);
|
||||
|
||||
// Eliminate copied source object extra fields that do not exist in target object
|
||||
|
|
@ -7436,7 +7438,7 @@ abstract class CommonObject
|
|||
*/
|
||||
public function updateExtraField($key, $trigger = null, $userused = null)
|
||||
{
|
||||
global $langs, $user, $hookmanager;
|
||||
global $langs, $user, $extrafields, $hookmanager;
|
||||
|
||||
if (getDolGlobalString('MAIN_EXTRAFIELDS_DISABLED')) {
|
||||
return 0;
|
||||
|
|
@ -7451,8 +7453,10 @@ abstract class CommonObject
|
|||
if (!empty($this->array_options) && isset($this->array_options["options_".$key])) {
|
||||
// Check parameters
|
||||
$langs->load('admin');
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
|
||||
$extrafields = new ExtraFields($this->db);
|
||||
if (!isset($extrafields) || !is_object($extrafields)) {
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
|
||||
$extrafields = new ExtraFields($this->db);
|
||||
}
|
||||
$extrafields->fetch_name_optionals_label($this->table_element);
|
||||
|
||||
$value = $this->array_options["options_".$key];
|
||||
|
|
|
|||
Loading…
Reference in a new issue