Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 3beae64ad8 - Show all commits

View File

@@ -484,8 +484,8 @@ function Util.loadTable(fname)
end end
--[[ loading and running functions ]] -- --[[ loading and running functions ]] --
function Util.httpGet(url, headers) function Util.httpGet(url, headers, isBinary)
local h, msg = http.get(url, headers) local h, msg = http.get(url, headers, isBinary)
if h then if h then
local contents = h.readAll() local contents = h.readAll()
h.close() h.close()

View File

@@ -99,5 +99,5 @@ function page:eventHandler(event)
end end
local args = { ... } local args = { ... }
UI:setPage(#args[1] and topicPage or page, args[1]) UI:setPage(args[1] and topicPage or page, args[1])
UI:pullEvents() UI:pullEvents()