Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
2938e01f
"test/phpunit/FunctionsLibTest.php" did not exist on "55904f7f37443691104e3359f2dcd4a29888668a"
Commit
2938e01f
authored
Dec 7, 2016
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix a delete must be done after a fetch
parent
49f5ec6b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
htdocs/user/card.php
+1
-1
1 addition, 1 deletion
htdocs/user/card.php
htdocs/user/class/user.class.php
+3
-3
3 additions, 3 deletions
htdocs/user/class/user.class.php
with
4 additions
and
4 deletions
htdocs/user/card.php
+
1
−
1
View file @
2938e01f
...
...
@@ -148,7 +148,7 @@ if (empty($reshook)) {
if
(
$action
==
'confirm_delete'
&&
$confirm
==
"yes"
&&
$candisableuser
)
{
if
(
$id
<>
$user
->
id
)
{
$object
=
new
User
(
$db
);
$object
->
id
=
$id
;
$object
->
fetch
(
$id
)
;
$result
=
$object
->
delete
();
if
(
$result
<
0
)
{
$langs
->
load
(
"errors"
);
...
...
This diff is collapsed.
Click to expand it.
htdocs/user/class/user.class.php
+
3
−
3
View file @
2938e01f
...
...
@@ -159,9 +159,9 @@ class User extends CommonObject
/**
* Load a user from database with its id or ref (login)
*
* @param int $id
Si
defin
i
, id
a utiliser pour reche
rch
e
* @param string $login
Si
defin
i
, login
a utiliser pour reche
rch
e
* @param string $sid
Si
defin
i
, sid
a utiliser pour reche
rch
e
* @param int $id
If
defin
ed
, id
to used for sea
rch
* @param string $login
If
defin
ed
, login
to used for sea
rch
* @param string $sid
If
defin
ed
, sid
to used for sea
rch
* @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.
* @return int <0 if KO, 0 not found, >0 if OK
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment