Skip to content

Fallback com_users new_usertype to guest_usergroup or public and not hardcode group id's #24363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HLeithner merged 3 commits into from
Apr 2, 2019
Merged

Fallback com_users new_usertype to guest_usergroup or public and not hardcode group id's #24363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7ff041
fallback new_usertype to guest_usergroup or public
zero-24 Mar 24, 2019
1e9072f
Update registration.php
zero-24 Mar 26, 2019
3800d0b
Merge branch 'staging' into hardcoded_usergroup_ids
zero-24 Mar 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions administrator/components/com_users/models/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,9 +938,9 @@ public function getAssignedGroups($userId = null)
}
else
{
$config = JComponentHelper::getParams('com_users');
$params = JComponentHelper::getParams('com_users');

if ($groupId = $config->get('new_usertype'))
if ($groupId = $params->get('new_usertype', $params->get('guest_usergroup', 1)))
{
$result[] = $groupId;
}
Expand Down
4 changes: 2 additions & 2 deletions components/com_users/models/registration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ public function getData()
// Get the groups the user should be added to after registration.
$this->data->groups = array();

// Get the default new user group, Registered if not specified.
$system = $params->get('new_usertype', 2);
// Get the default new user group, guest or public group if not specified.
$system = $params->get('new_usertype', $params->get('guest_usergroup', 1));

$this->data->groups[] = $system;

Expand Down
6 changes: 3 additions & 3 deletions plugins/user/joomla/joomla.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,10 @@ protected function _getUser($user, $options = array())
}

// TODO : move this out of the plugin
$config = ComponentHelper::getParams('com_users');
$params = ComponentHelper::getParams('com_users');

// Hard coded default to match the default value from com_users.
$defaultUserGroup = $config->get('new_usertype', 2);
// Read the default user group option from com_users
$defaultUserGroup = $params->get('new_usertype', $params->get('guest_usergroup', 1));

$instance->id = 0;
$instance->name = $user['fullname'];
Expand Down