Skip to content

Commit

Permalink
Drone fix
Browse files Browse the repository at this point in the history
  • Loading branch information
carlitorweb committed May 4, 2018
1 parent 3021bd2 commit 9b773a1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions administrator/components/com_users/models/user.php
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ public function save($data)
}
}
}

// User cannot modify own user groups
if ((int) $user->id == (int) $my->id && !$iAmSuperAdmin && isset($data['groups']))
{
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.com_users.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used
COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha"
COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Username when editing their profile."
COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Username"
COM_USERS_CONFIG_FIELD_DOMAIN_TLD_RESTRICTION_DESC="Whitelist Email/TLD: Users can register only from the email domains and/or TLD (Top level domain) that are inside this list. Enter each domain or TLD in a new line. Example of a domain: gmail.com . Example of a TLD: gov\n\nBlacklist Email/TLD: Users can register except those email domain and TLD (Top level domain) in the blacklist. Enter each domain or TLD in a new line. Example of a domain: gmail.com . Example of a TLD: gov"
COM_USERS_CONFIG_FIELD_DOMAIN_TLD_RESTRICTION_DESC="Whitelist Email/TLD: Users can register only from the emails domains and/or TLD (Top level domain). <br /><br /> Blacklist Email/TLD: Users can register except those emails domains and TLD (Top level domain) in the blacklist. <br /><br /> Enter each domain or TLD in a new line. Example of a domain 'gmail.com' . Example of a TLD 'gov'"
COM_USERS_CONFIG_FIELD_DOMAIN_TLD_RESTRICTION_LABEL="Email/TLD Restriction"
COM_USERS_CONFIG_FIELD_DOMAIN_TLD_RESTRICTION_OPTION_BLACKLIST="Blacklist"
COM_USERS_CONFIG_FIELD_DOMAIN_TLD_RESTRICTION_OPTION_WHITELIST="Whitelist"
Expand Down

0 comments on commit 9b773a1

Please sign in to comment.