diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2016-06-08 19:07:39 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2017-02-27 17:16:36 +0000 |
| commit | ef4c791b227956013b5faf5cc4c9d1fac5d0786b (patch) | |
| tree | 3a873ab3202025219e5ff3ca8028afe0b2f4cf0a | |
| parent | 8d5e18ed2adf3c66997d21bf205101c049c39de2 (diff) | |
| download | acf-core-ef4c791b227956013b5faf5cc4c9d1fac5d0786b.tar.bz2 acf-core-ef4c791b227956013b5faf5cc4c9d1fac5d0786b.tar.xz | |
Cleanup of view exceptions when not using acf_www
(cherry picked from commit 3528f073595e2097de3b3acf0a2c40bd17bc485a)
| -rwxr-xr-x | lua/mvc.lua | 6 |
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, |