Module:Icon: Difference between revisions

@@ Line 157: / Line 157: @@
 	setmetatable(out, {
 		__index = function(t, key)
-			local val = base[key]
+			-- be defensive: base or extra may be nil
-			if val ~= nil then return val else return extra[key] end
+			local val
+			if base ~= nil then
+				val = base[key]
+			end
+			if val ~= nil then
+				return val
+			end
+			if extra ~= nil then
+				return extra[key]
+			end
+			return nil
 		end
 	})
 	return out
 end
 local neighbors = mw.loadData('Module:Card/neighbors')
 local ALL_DATA = {-- list of {type, data} in the order that untyped items should get checked
@@ Line 361: / Line 372: @@
 	image.prefix = image_type
 	image.suffix = 'Icon'
+	image.defaults.suffix = 'Icon'
+     return image, image_type, data
 end
 return p