From 22cc5c7035dba03afb2728e8d85c9a6b8b6c0bbe Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 20 Dec 2011 17:19:44 +0100 Subject: [PATCH] Fix: superadmin is downgrade after update --- htdocs/user/class/user.class.php | 2 -- htdocs/user/fiche.php | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index c866085e50c..4d671ecb393 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1137,8 +1137,6 @@ class User extends CommonObject $adh->user_id=$this->id; $adh->user_login=$this->login; - //$adh->entity=$this->entity; - $result=$adh->update($user,0,1); if ($result < 0) { diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 7727f351915..d82a3db71b1 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -1584,7 +1584,8 @@ else { $yn = yn($fuser->admin); print ''; - if (! empty($conf->multicompany->enabled) && ! $fuser->entity) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning'); + print ''; + if (! empty($conf->multicompany->enabled) && empty($fuser->entity)) print $form->textwithpicto($yn,$langs->trans("DontDowngradeSuperAdmin"),1,'warning'); else print $yn; } print '';