Revert all commits up to (including) a704c04f

builtin/common/misc_helpers.lua

@@ -545,11 +545,12 @@ function table.copy(t, seen)
 	seen = seen or {}
 	seen[t] = n
 	for k, v in pairs(t) do
-		n[(type(k) == "table" and (seen[k] or table.copy(k, seen))) or k] =
-			(type(v) == "table" and (seen[v] or table.copy(v, seen))) or v
+		n[type(k) ~= "table" and k or seen[k] or table.copy(k, seen)] =
+			type(v) ~= "table" and v or seen[v] or table.copy(v, seen)
 	end
 	return n
 end
+
 --------------------------------------------------------------------------------
 -- mainmenu only functions
 --------------------------------------------------------------------------------
@@ -564,7 +565,7 @@ if INIT == "mainmenu" then
 		return nil
 	end
 
-	function fgettext_ne(text, ...)
+	function fgettext(text, ...)
 		text = core.gettext(text)
 		local arg = {n=select('#', ...), ...}
 		if arg.n >= 1 then
@@ -586,11 +587,7 @@ if INIT == "mainmenu" then
 			end
 			text = result
 		end
-		return text
-	end
-
-	function fgettext(text, ...)
-		return core.formspec_escape(fgettext_ne(text, ...))
+		return core.formspec_escape(text)
 	end
 end
 

builtin/common/serialize.lua

@@ -115,20 +115,11 @@ function core.serialize(x)
 	function dump_val(x)
 		local  tp = type(x)
 		if     x  == nil        then return "nil"
+		elseif tp == "number"   then return string.format("%d", x)
 		elseif tp == "string"   then return string.format("%q", x)
 		elseif tp == "boolean"  then return x and "true" or "false"
 		elseif tp == "function" then
 			return string.format("loadstring(%q)", string.dump(x))
-		elseif tp == "number"   then
-			-- Serialize integers with string.format to prevent
-			-- scientific notation, which doesn't preserve
-			-- precision and breaks things like node position
-			-- hashes.  Serialize floats normally.
-			if math.floor(x) == x then
-				return string.format("%d", x)
-			else
-				return tostring(x)
-			end
 		elseif tp == "table" then
 			local vals = {}
 			local idx_dumped = {}