# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1647866198 0
# Node ID ba5bf1d9d9bd8826f0a1de5890341c9560ecd4fa
# Parent  7a3da1acace11d2ed8802c74bc4e59ae79388ba2# Parent  018ac691ee2236bd35af184e746ac02345872a04
Merge 0.12->trunk

diff -r 7a3da1acace1 -r ba5bf1d9d9bd plugins/mod_pubsub/mod_pubsub.lua
--- a/plugins/mod_pubsub/mod_pubsub.lua	Mon Mar 21 11:15:30 2022 +0000
+++ b/plugins/mod_pubsub/mod_pubsub.lua	Mon Mar 21 12:36:38 2022 +0000
@@ -84,7 +84,7 @@
 			end
 			if not expose_publisher then
 				item.attr.publisher = nil;
-			elseif not item.attr.publisher then
+			elseif not item.attr.publisher and actor ~= true then
 				item.attr.publisher = service.config.normalize_jid(actor);
 			end
 		end