Merge the merge

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 8634e337f98ee1db5b43470581764755a4c9e12c..52924841a0dc4fcc98907ed2eb96f9891c1cdbfe 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -187,7 +187,11 @@ field_readers["list-multi"] =
                for value in field_tag:childtags("value") do
                        result[#result+1] = value:get_text();
                end
-               return result, (required and #result == 0 and "Required value missing" or nil);
+               if #result > 0 then
+                       return result;
+               elseif required then
+                       return nil, "Required value missing";
+               end
        end
 
 field_readers["text-multi"] =