From: Steven Barth <steven@midlink.org>
Date: Sat, 11 Oct 2008 11:30:43 +0000 (+0000)
Subject: OXYGEN #4: Fixed indexing support in dispatcher
X-Git-Tag: 0.9.0~1118
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d97b73c8c03137c4cf4842f2f5c25940f4fc3246;p=oweals%2Fluci.git

OXYGEN #4: Fixed indexing support in dispatcher
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index d03b2ec37..5a9a0c6f5 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -232,16 +232,20 @@ function dispatch(request)
 		luci.sys.process.setuser(track.setuser)
 	end
 
+	if c and (c.index or type(c.target) == "function") then
+		ctx.dispatched = c
+		ctx.requested = ctx.requested or ctx.dispatched
+	end
+
 	if c and c.index then
 		local tpl = require "luci.template"
-		if util.copcall(tpl.render, "indexer") then
+
+		if util.copcall(tpl.render, "indexer", {}) then
 			return true
 		end
 	end
 
 	if c and type(c.target) == "function" then
-		context.dispatched = c
-
 		util.copcall(function()
 			local oldenv = getfenv(c.target)
 			local module = require(c.module)