use isModEnabled
This commit is contained in:
parent
4e3dcbab29
commit
ce227bd78e
@ -12,7 +12,7 @@
|
|||||||
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
|
||||||
* Copyright (C) 2018 charlene Benke <charlie@patas-monkey.com>
|
* Copyright (C) 2018 charlene Benke <charlie@patas-monkey.com>
|
||||||
* Copyright (C) 2018-2021 Nicolas ZABOURI <info@inovea-conseil.com>
|
* Copyright (C) 2018-2021 Nicolas ZABOURI <info@inovea-conseil.com>
|
||||||
* Copyright (C) 2019-2020 Frédéric France <frederic.france@netlogic.fr>
|
* Copyright (C) 2019-2023 Frédéric France <frederic.france@netlogic.fr>
|
||||||
* Copyright (C) 2019 Abbes Bahfir <dolipar@dolipar.org>
|
* Copyright (C) 2019 Abbes Bahfir <dolipar@dolipar.org>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
@ -2453,7 +2453,7 @@ class User extends CommonObject
|
|||||||
//print $password.'-'.$this->id.'-'.$dolibarr_main_instance_unique_id;
|
//print $password.'-'.$this->id.'-'.$dolibarr_main_instance_unique_id;
|
||||||
$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword';
|
$url = $urlwithroot.'/user/passwordforgotten.php?action=validatenewpassword';
|
||||||
$url .= '&username='.urlencode($this->login)."&passworduidhash=".urlencode(dol_hash($password.'-'.$this->id.'-'.$dolibarr_main_instance_unique_id));
|
$url .= '&username='.urlencode($this->login)."&passworduidhash=".urlencode(dol_hash($password.'-'.$this->id.'-'.$dolibarr_main_instance_unique_id));
|
||||||
if (!empty($conf->multicompany->enabled)) {
|
if (isModEnabled('multicompany')) {
|
||||||
$url .= '&entity='.(!empty($this->entity) ? $this->entity : 1);
|
$url .= '&entity='.(!empty($this->entity) ? $this->entity : 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user