mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-23 10:26:28 +01:00
Core/RBAC: Fix revoking permissions
(cherry picked from commit cb911cad00)
This commit is contained in:
@@ -236,10 +236,10 @@ void RBACData::AddPermissions(RBACPermissionContainer const& permsFrom, RBACPerm
|
||||
permsTo.insert(*itr);
|
||||
}
|
||||
|
||||
void RBACData::RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo)
|
||||
void RBACData::RemovePermissions(RBACPermissionContainer& permsFrom, RBACPermissionContainer const& permsToRemove)
|
||||
{
|
||||
for (RBACPermissionContainer::const_iterator itr = permsFrom.begin(); itr != permsFrom.end(); ++itr)
|
||||
permsTo.erase(*itr);
|
||||
for (RBACPermissionContainer::const_iterator itr = permsToRemove.begin(); itr != permsToRemove.end(); ++itr)
|
||||
permsFrom.erase(*itr);
|
||||
}
|
||||
|
||||
void RBACData::ExpandPermissions(RBACPermissionContainer& permissions)
|
||||
|
||||
@@ -938,8 +938,8 @@ class RBACData
|
||||
/// Adds a list of permissions to another list
|
||||
void AddPermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo);
|
||||
|
||||
/// Removes a list of permissions to another list
|
||||
void RemovePermissions(RBACPermissionContainer const& permsFrom, RBACPermissionContainer& permsTo);
|
||||
/// Removes a list of permissions from another list
|
||||
void RemovePermissions(RBACPermissionContainer& permsFrom, RBACPermissionContainer const& permsToRemove);
|
||||
|
||||
/**
|
||||
* @name ExpandPermissions
|
||||
|
||||
Reference in New Issue
Block a user