# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1457700070 -3600
# Node ID cde4ef90cf3d05d76edbcc91a97eb17d01abff05
# Parent  015a711a8ccf64829af6cc35f61c9c6371a5263d# Parent  29861845e0e066cf4869836b211045c3040665eb
Merge 0.10->trunk

diff -r 015a711a8ccf -r cde4ef90cf3d plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Thu Mar 10 17:55:40 2016 +0000
+++ b/plugins/mod_presence.lua	Fri Mar 11 13:41:10 2016 +0100
@@ -51,7 +51,7 @@
 	end
 end
 
-local ignore_presence_priority = module:get_option("ignore_presence_priority");
+local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false);
 
 function handle_normal_presence(origin, stanza)
 	if ignore_presence_priority then
diff -r 015a711a8ccf -r cde4ef90cf3d plugins/mod_watchregistrations.lua
--- a/plugins/mod_watchregistrations.lua	Thu Mar 10 17:55:40 2016 +0000
+++ b/plugins/mod_watchregistrations.lua	Fri Mar 11 13:41:10 2016 +0100
@@ -11,7 +11,7 @@
 local jid_prep = require "util.jid".prep;
 
 local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
-local registration_notification = module:get_option("registration_notification", "User $username just registered on $host from $ip");
+local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip");
 
 local st = require "util.stanza";
 
diff -r 015a711a8ccf -r cde4ef90cf3d plugins/muc/mod_muc.lua
diff -r 015a711a8ccf -r cde4ef90cf3d prosodyctl
--- a/prosodyctl	Thu Mar 10 17:55:40 2016 +0000
+++ b/prosodyctl	Fri Mar 11 13:41:10 2016 +0100
@@ -869,6 +869,7 @@
 		print("Checking config...");
 		local deprecated = set.new({
 			"bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption",
+			"vcard_compatibility",
 		});
 		local known_global_options = set.new({
 			"pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
diff -r 015a711a8ccf -r cde4ef90cf3d util/dependencies.lua
--- a/util/dependencies.lua	Thu Mar 10 17:55:40 2016 +0000
+++ b/util/dependencies.lua	Fri Mar 11 13:41:10 2016 +0100
@@ -101,7 +101,7 @@
 
 	local encodings, err = softreq "util.encodings"
 	if not encodings then
-		if err:match("not found") then
+		if err:match("module '[^']*' not found") then
 			missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/";
 		 				["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so";
 		 			});
@@ -118,7 +118,7 @@
 
 	local hashes, err = softreq "util.hashes"
 	if not hashes then
-		if err:match("not found") then
+		if err:match("module '[^']*' not found") then
 			missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/";
 		 				["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so";
 		 			});