summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2012-01-19 21:47:09 +0000
committerTed Trask <ttrask01@yahoo.com>2012-01-21 15:43:52 +0000
commitdde1d8542ded5de35d1e45c779c9c0d5f0bf65f8 (patch)
tree16ccc2f890a11e51dd05ae70eeaa3889bd9a8daf
parented9777420e29c7f1631ff890a1429d4717dd411a (diff)
downloadacf-core-dde1d8542ded5de35d1e45c779c9c0d5f0bf65f8.tar.bz2
acf-core-dde1d8542ded5de35d1e45c779c9c0d5f0bf65f8.tar.xz
Must allow roles to have '-' character
(cherry picked from commit 8cbd5764dc499274a0fd2f97717dfa1de121788a)
-rw-r--r--lib/roles.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/roles.lua b/lib/roles.lua
index 8cc5332..0cfd382 100644
--- a/lib/roles.lua
+++ b/lib/roles.lua
@@ -299,8 +299,8 @@ set_role_perm = function(self, role, permissions, permissions_array)
if role==nil or role=="" then
return false, "Invalid Role"
end
- if string.find(role, '[^%w_/]') then
- return false, "Role can only contain letters, numbers, '/', and '_'"
+ if string.find(role, '[^%w_/-]') then
+ return false, "Role can only contain letters, numbers, '/', '-', and '_'"
end
if permissions and not permissions_array then
permissions_array = {}