summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-11-11 19:16:49 +0000
committerTed Trask <ttrask01@yahoo.com>2008-11-11 19:16:49 +0000
commitd3a17ed2c3fabf376f8752d53729a2352e83b45c (patch)
tree354f2e74c4db8d806a5c7feba79e2c0c05d57116 /lib
parent29ba98b4f151883bedfb6561051d17b4889322aa (diff)
downloadacf-core-d3a17ed2c3fabf376f8752d53729a2352e83b45c.tar.bz2
acf-core-d3a17ed2c3fabf376f8752d53729a2352e83b45c.tar.xz
Cleaned up package path code in roles.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1593 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'lib')
-rw-r--r--lib/roles.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/roles.lua b/lib/roles.lua
index dcf2bd9..e6e6515 100644
--- a/lib/roles.lua
+++ b/lib/roles.lua
@@ -57,8 +57,10 @@ get_controllers_func = function(self,controller_info)
if controller_info == nil then
return "Could not be processed"
else
- package.path=package.path .. ";" .. controller_info.path .. "?.lua"
+ local PATH = package.path
+ package.path = controller_info.path .. "?.lua;" .. package.path
temp = require (controller_info.name)
+ package.path = PATH
temp1 = {}
for a,b in pairs(temp) do
local c = string.match(a,"^mvc") or string.match(a,"^_")
@@ -66,8 +68,6 @@ get_controllers_func = function(self,controller_info)
temp1[#temp1 +1] = a
end
end
- --require (controller_info.name)
- --we need to go through bobo and take out the mvc func and locals and --
return temp1
end
end