From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 7 Aug 2009 15:16:14 +0000 (+0000)
Subject: libs/web: restore protected call to Template(), was accidentally removed in r4889
X-Git-Tag: 0.10.0~1221
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=5676686863a56aa8518ca9328fbed9036ce7c823

libs/web: restore protected call to Template(), was accidentally removed in r4889
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index a375eecc8..6d4433975 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -219,8 +219,7 @@ function dispatch(request)
 	if (c and c.index) or not track.notemplate then
 		local tpl = require("luci.template")
 		local media = track.mediaurlbase or luci.config.main.mediaurlbase
-		if not tpl.Template("themes/%s/header" % fs.basename(media)) then 
-		--if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
+		if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
 			media = nil
 			for name, theme in pairs(luci.config.themes) do
 				if name:sub(1,1) ~= "." and pcall(tpl.Template,