# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1278096937 -3600
# Node ID 4019ad5c61e242dfa1d3905bc60a03b937e13cc8
# Parent  12fc7e005e8b80659f9a44b8c1f73b9694c20da6# Parent  9bcf8d612a5207536b6990027395df73722e01e3
Merge 0.7->trunk

diff -r 12fc7e005e8b -r 4019ad5c61e2 plugins/mod_privacy.lua
--- a/plugins/mod_privacy.lua	Fri Jul 02 17:44:14 2010 +0100
+++ b/plugins/mod_privacy.lua	Fri Jul 02 19:55:37 2010 +0100
@@ -93,8 +93,10 @@
 	elseif which == "active" and list then
 		origin.activePrivacyList = name;
 		origin.send(st.reply(stanza));
+	elseif not list then
+		return {"cancel", "item-not-found", "No such list: "..name};
 	else
-		return {"modify", "bad-request", "Either not active or default given or unknown list name specified."};
+		return {"modify", "bad-request", "No list chosen to be active or default."};
 	end
 	return true;
 end