summaryrefslogtreecommitdiffstats
path: root/lua/mvc.lua
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2016-06-08 19:07:39 +0000
committerTed Trask <ttrask01@yahoo.com>2016-06-08 19:07:39 +0000
commit3528f073595e2097de3b3acf0a2c40bd17bc485a (patch)
tree840d10708350f1c03f13294f9c44e7ac9c35f42b /lua/mvc.lua
parent78f9235542761789543b3299aab3c98e6ffd29e3 (diff)
downloadacf-core-3528f073595e2097de3b3acf0a2c40bd17bc485a.tar.bz2
acf-core-3528f073595e2097de3b3acf0a2c40bd17bc485a.tar.xz
Cleanup of view exceptions when not using acf_www
Diffstat (limited to 'lua/mvc.lua')
-rwxr-xr-xlua/mvc.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/lua/mvc.lua b/lua/mvc.lua
index 4ef4eb7..efed01f 100755
--- a/lua/mvc.lua
+++ b/lua/mvc.lua
@@ -354,7 +354,7 @@ mymodule.auto_view = function(viewtable, viewlibrary, pageinfo, session)
local json = require("json")
print(json.encode(viewtable))
elseif pageinfo.viewtype == "stream" then
- io.write(viewtable.value)
+ io.write(tostring(viewtable.value))
elseif pageinfo.viewtype == "serialized" then
local s = require("session")
print(s.serialize("result", viewtable))
@@ -382,8 +382,8 @@ mymodule.view_resolver = function(self)
controller = self.conf.controller,
action = self.conf.action,
prefix = self.conf.prefix,
- script = self.conf.script,
- wwwdir = self.conf.wwwdir,
+ script = self.conf.script or "",
+ wwwdir = self.conf.wwwdir or "",
wwwprefix = self.conf.wwwprefix or "",
staticdir = self.conf.staticdir or "",
orig_action = self.conf.orig_action or self.conf.prefix .. self.conf.controller .. "/" .. self.conf.action,