Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a delete must be done after a fetch

Browse Source
This commit is contained in:
Laurent Destailleur
2016-12-07 19:16:33 +01:00
parent 49f5ec6b52
commit 2938e01fdd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/user/card.php
View File

@@ -148,7 +148,7 @@ if (empty($reshook)) {
if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser) { if ($action == 'confirm_delete' && $confirm == "yes" && $candisableuser) {
if ($id <> $user->id) { if ($id <> $user->id) {
$object = new User($db); $object = new User($db);
$object->id = $id; $object->fetch($id);
$result = $object->delete(); $result = $object->delete();
if ($result < 0) { if ($result < 0) {
$langs->load("errors"); $langs->load("errors");

6
htdocs/user/class/user.class.php
View File

@@ -159,9 +159,9 @@ class User extends CommonObject
/** /**
* Load a user from database with its id or ref (login) * Load a user from database with its id or ref (login)
* *
* @param int $id Si defini, id a utiliser pour recherche * @param int $id If defined, id to used for search
* @param string $login Si defini, login a utiliser pour recherche * @param string $login If defined, login to used for search
* @param string $sid Si defini, sid a utiliser pour recherche * @param string $sid If defined, sid to used for search
* @param int $loadpersonalconf 1=also load personal conf of user (in $user->conf->xxx) * @param int $loadpersonalconf 1=also load personal conf of user (in $user->conf->xxx)
* @param int $entity If a value is >= 0, we force the search on a specific entity. If -1, means search depens on default setup. * @param int $entity If a value is >= 0, we force the search on a specific entity. If -1, means search depens on default setup.
* @return int <0 if KO, 0 not found, >0 if OK * @return int <0 if KO, 0 not found, >0 if OK