Diff

plugins/mod_privacy.lua @ 3314:4019ad5c61e2

Merge 0.7->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 02 Jul 2010 19:55:37 +0100
parent 3301:772fb30b28fb
parent 3313:9bcf8d612a52
child 3318:8d09b21aeaa9
line wrap: on
line diff
--- 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