# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1585946388 -7200
# Node ID 6119e4f87c32c3c1df59b500e5e9c03dfae9f389
# Parent  0230ceecb8a9043ba0a90d6bd43fc7fd36968aba# Parent  c4b49939b471556d7ed7ff98f2e6771ce07a201e
Merge 0.11->trunk

diff -r 0230ceecb8a9 -r 6119e4f87c32 plugins/mod_vcard4.lua
--- a/plugins/mod_vcard4.lua	Wed Apr 01 22:32:50 2020 +0200
+++ b/plugins/mod_vcard4.lua	Fri Apr 03 22:39:48 2020 +0200
@@ -14,9 +14,9 @@
 	local ok, id, item = pep_service:get_last_item("urn:xmpp:vcard4", stanza.attr.from);
 	if ok and item then
 		origin.send(st.reply(stanza):add_child(item.tags[1]));
-	elseif item == "item-not-found" or not id then
+	elseif id == "item-not-found" or not id then
 		origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
-	elseif item == "forbidden" then
+	elseif id == "forbidden" then
 		origin.send(st.error_reply(stanza, "auth", "forbidden"));
 	else
 		origin.send(st.error_reply(stanza, "modify", "undefined-condition"));