Skip to content

Exceptions in Joomla\CMS\Table\Usergroup refer to categories #21098

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
merged 2 commits into from
Jul 13, 2018
Merged

Exceptions in Joomla\CMS\Table\Usergroup refer to categories #21098

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28dc99
Exceptions in Joomla\CMS\Table\Usergroup refer to categories
brianteeman Jul 13, 2018
b30313f
Update Usergroup.php
brianteeman Jul 13, 2018
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
7 changes: 2 additions & 5 deletions libraries/src/Table/Usergroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,12 @@ public function delete($oid = null)

if ($this->id == 0)
{
throw new \UnexpectedValueException('Global Category not found');
throw new \UnexpectedValueException('Usergroup not found');
}

if ($this->parent_id == 0)
{
throw new \UnexpectedValueException('Root categories cannot be deleted.');
throw new \UnexpectedValueException('Root usergroup cannot be deleted.');
}

if ($this->lft == 0 || $this->rgt == 0)
Expand All @@ -189,9 +189,6 @@ public function delete($oid = null)
throw new \UnexpectedValueException('Left-Right data inconsistency. Cannot delete usergroup.');
}

// Delete the category dependencies
// @todo Remove all related threads, posts and subscriptions

// Delete the usergroup and its children
$query->clear()
->delete($db->quoteName($this->_tbl))
Expand Down