libs/web: use new parser in non-caching mode

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index 4971033a2723309e30265ec856104bc1bfc90eea..7cc6e11b0857a20f308012d23924dc707c89e213 100644 (file)
--- a/libs/web/luasrc/template.lua
+++ b/libs/web/luasrc/template.lua
@@ -32,6 +32,7 @@ local string = require "string"
 local config = require "luci.config"
 local coroutine = require "coroutine"
 local nixio = require "nixio", require "nixio.util"
+local tparser = require "luci.template.parser"
 
 local tostring, pairs, loadstring = tostring, pairs, loadstring
 local setmetatable, loadfile = setmetatable, loadfile
@@ -206,12 +207,7 @@ function Template.__init__(self, name)
                end
                
        elseif compiler_mode == "memory" then
-               local source
-               source, err = fs.readfile(sourcefile) or fs.readfile(sourcefile .. ".htm")
-               if source then
-                       self.template, err = compile(source)
-               end
-                       
+               self.template, _, err = tparser.parse(sourcefile .. ".htm")
        end
        
        -- If we have no valid template throw error, otherwise cache the template