From: Kim Alvefur <zash@zash.se>
Date: Mon, 30 May 2016 11:17:28 +0000 (+0200)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=c18153e25135af31149458afbb695fa8e84f345f;hp=367213c4a9809120ba012f6a1d1c845dc183bfe5;p=prosody.git

Merge 0.10->trunk
---

diff --git a/prosodyctl b/prosodyctl
index e3bc6ffa..4a6ce44e 100755
--- 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 685f3aaf..756f35a7 100644
--- 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