diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-07-02 19:55:37 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-07-02 19:55:37 +0100 |
| commit | 423ad6b5d1e075b11b8cb7d10703a2ba07ef306b (patch) | |
| tree | 109daa807d4675331721a461abff6e7f68caff18 /plugins | |
| parent | f654c430081b0161e66e28c70e6da80a5da99250 (diff) | |
| parent | 7f0f97fd7f4bfdc314ed7a071a0eefc84a18f788 (diff) | |
| download | prosody-423ad6b5d1e075b11b8cb7d10703a2ba07ef306b.tar.gz prosody-423ad6b5d1e075b11b8cb7d10703a2ba07ef306b.zip | |
Merge 0.7->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_privacy.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua index 10f44950..e3d38af9 100644 --- a/plugins/mod_privacy.lua +++ b/plugins/mod_privacy.lua @@ -93,8 +93,10 @@ function activateList(privacy_lists, origin, stanza, which, name) 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 |