From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 23 Jul 2009 01:41:06 +0000 (+0000)
Subject: libs/web: use new parser in non-caching mode
X-Git-Tag: 0.10.0~1325
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e0b6b681c1d62465d285859d3496f0667d35018;p=oweals%2Fluci.git

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

diff --git a/libs/web/luasrc/template.lua b/libs/web/luasrc/template.lua
index 4971033a2..7cc6e11b0 100644
--- 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