Changeset 19954 for extensions/UserAdvManager/branches/2.41/include/functions.inc.php

Timestamp:

Jan 7, 2013, 9:51:32 PM (11 years ago)

Author:

Eric

Message:

Merged from trunk to branch 2.41 :
Bug 2818 fixed - "Reject user's connexion until registration is confirmed" should not reject admins connections
Add da_DK, thanks to : Kaare
Update it_IT, thanks to : Ericnet

File:

• extensions/UserAdvManager/branches/2.41/include/functions.inc.php (modified) (1 diff)

extensions/UserAdvManager/branches/2.41/include/functions.inc.php

@@ -431 +431 @@
 
   // Avoid login into public galleries until registration confirmation is done
-  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'false') or ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and UAM_UsrReg_Verif($user['id'])))
+  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'false') or ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and UAM_UsrReg_Verif($user['id'])) or  (!is_admin() and !is_webmaster()))
   {
     // Performing redirection to profile page on first login