[Fix] Fix override_defaults function

diff --git a/lualib/lua_fuzzy.lua b/lualib/lua_fuzzy.lua
index 178d06400ece19e787ac1051b42793ecc46d36e9..bd601c038e79fde8637d9d49927e4e286e1c996a 100644 (file)
--- a/lualib/lua_fuzzy.lua
+++ b/lualib/lua_fuzzy.lua
@@ -262,6 +262,7 @@ local function mime_types_check(task, part, rule)
   end
 
   if rule.mime_types then
+
     if fun.any(function(gl_re)
       if gl_re:match(ct) then return true else return false end
     end, rule.mime_types) then

diff --git a/lualib/lua_util.lua b/lualib/lua_util.lua
index 276b8e05a733cbff76051529ec6838a948b05389..8611946a15f31bbc697e7a2b744eed22a38c1b01 100644 (file)
--- a/lualib/lua_util.lua
+++ b/lualib/lua_util.lua
@@ -520,7 +520,8 @@ local function override_defaults(def, override)
   end
 
   local res = {}
-  fun.each(function(k, v)
+
+  for k,v in pairs(override) do
     if type(v) == 'table' then
       if def[k] and type(def[k]) == 'table' then
         -- Recursively override elements
@@ -531,12 +532,13 @@ local function override_defaults(def, override)
     else
       res[k] = v
     end
-    end, override)
-  fun.each(function(k, v)
+  end
+
+  for k,v in pairs(def) do
     if not res[k] then
       res[k] = v
     end
-  end, def)
+  end
 
   return res
 end