diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2012-01-19 21:10:27 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2012-01-21 15:43:30 +0000 |
| commit | ed9777420e29c7f1631ff890a1429d4717dd411a (patch) | |
| tree | dda0cfdf49057c229439f2214e5b1c6d3eab9f8f | |
| parent | 47b38a786a74ba684e2c76624ad884caa82bcb11 (diff) | |
| download | acf-core-ed9777420e29c7f1631ff890a1429d4717dd411a.tar.bz2 acf-core-ed9777420e29c7f1631ff890a1429d4717dd411a.tar.xz | |
Fixed bug in roles where last matching controller used, rather than first
(cherry picked from commit 1e53255088385fcfe49747202227d30a76e08c89)
| -rw-r--r-- | lib/roles.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/roles.lua b/lib/roles.lua index 7c69724..8cc5332 100644 --- a/lib/roles.lua +++ b/lib/roles.lua @@ -52,7 +52,9 @@ get_controllers = function(self,pre,controller) filename = string.match(v,"[^/]*.lua") name = string.match(filename,"[^.]*") sname = string.match(filename,"[^-]*") - temp[prefix..sname] = {path=path,prefix=prefix,filename=filename,name=name,sname=sname} + if not temp[prefix..sname] then -- only keep the first of each + temp[prefix..sname] = {path=path,prefix=prefix,filename=filename,name=name,sname=sname} + end end if pre and controller then return temp[pre..controller] |