Diff

util/dataforms.lua @ 6679:96e034508978

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 13 May 2015 17:00:27 +0100
parent 6672:d6a60e74f773
child 6777:5de6b93d0190
line wrap: on
line diff
--- a/util/dataforms.lua	Wed May 06 19:26:53 2015 +0100
+++ b/util/dataforms.lua	Wed May 13 17:00:27 2015 +0100
@@ -7,7 +7,7 @@
 --
 
 local setmetatable = setmetatable;
-local pairs, ipairs = pairs, ipairs;
+local ipairs = ipairs;
 local tostring, type, next = tostring, type, next;
 local t_concat = table.concat;
 local st = require "util.stanza";
@@ -32,7 +32,7 @@
 	if layout.instructions then
 		form:tag("instructions"):text(layout.instructions):up();
 	end
-	for n, field in ipairs(layout) do
+	for _, field in ipairs(layout) do
 		local field_type = field.type or "text-single";
 		-- Add field tag
 		form:tag("field", { type = field_type, var = field.name, label = field.label });