summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/acf_www-controller.lua2
-rw-r--r--lib/htmlviewfunctions.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua
index 7fdf998..1fd16d5 100644
--- a/app/acf_www-controller.lua
+++ b/app/acf_www-controller.lua
@@ -179,7 +179,7 @@ local redirect_to_referrer = function(self, result)
elseif self.sessiondata[self.conf.action.."result"] then
-- If we don't have a result, but there's a result in the session data,
-- then we're a component redirected as above. Return the last result.
- result = self.sessiondata[self.conf.action.."result"]
+ result = cfe(self.sessiondata[self.conf.action.."result"])
self.sessiondata[self.conf.action.."result"] = nil
end
return result
diff --git a/lib/htmlviewfunctions.lua b/lib/htmlviewfunctions.lua
index 3c9f34e..16a3945 100644
--- a/lib/htmlviewfunctions.lua
+++ b/lib/htmlviewfunctions.lua
@@ -329,7 +329,7 @@ function mymodule.displaycommandresults(commands, session, preserveerrors)
local cmdresult = {}
for i,cmd in ipairs(commands) do
if session[cmd.."result"] then
- cmdresult[#cmdresult + 1] = session[cmd.."result"]
+ cmdresult[#cmdresult + 1] = cfe(session[cmd.."result"])
if not preserveerrors or not session[cmd.."result"].errtxt then
session[cmd.."result"] = nil
end
@@ -339,7 +339,7 @@ function mymodule.displaycommandresults(commands, session, preserveerrors)
io.write('<div class="command-results"><h1>Command Result</h1>')
for i,result in ipairs(cmdresult) do
if type(result.value) == "string" and result.value ~= "" then io.write('<p>' .. string.gsub(html.html_escape(result.value), "\n", "<br/>") .. "</p>") end
- mymodule.displayinfo(result)
+ if result.errtxt then io.write('<p class="error">' .. string.gsub(html.html_escape(result:print_errtxt()), "\n", "<br/>") .. '</p>') end
end
io.write('</div><!-- end .command-results -->')
end