Merge 0.10->trunk

diff --git a/prosodyctl b/prosodyctl
index e3bc6ffabbf0aa20531fac918bcefacae64fd099..4a6ce44efd68acfe4b33fea8250e119cc9eb97cb 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -1261,13 +1261,13 @@ function commands.check(arg)
                                                end
                                                if config.get(host, "component_module") == nil
                                                        and not x509_verify_identity(host, "_xmpp-client", cert) then
-                                                       print("    Not vaild for client connections to "..host..".")
+                                                       print("    Not valid for client connections to "..host..".")
                                                        cert_ok = false
                                                end
                                                if (not (config.get(host, "anonymous_login")
                                                        or config.get(host, "authentication") == "anonymous"))
                                                        and not x509_verify_identity(host, "_xmpp-server", cert) then
-                                                       print("    Not vaild for server-to-server connections to "..host..".")
+                                                       print("    Not valid for server-to-server connections to "..host..".")
                                                        cert_ok = false
                                                end
                                        end

diff --git a/util/dataforms.lua b/util/dataforms.lua
index 685f3aaf298b2f1f5975f5f85bc0f935320ec263..756f35a7f3e1f9957421227b7568986785414dc9 100644 (file)
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -72,7 +72,7 @@ function form_t.form(layout, data, formtype)
                                for _, val in ipairs(field.options or value) do
                                        if type(val) == "table" then
                                                form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
-                                               if value == val.value or field.options and val.default and (not has_default) then
+                                               if value == val.value or val.default and (not has_default) then
                                                        form:tag("value"):text(val.value):up();
                                                        has_default = true;
                                                end