aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2022-03-21 12:36:38 +0000
committerMatthew Wild <mwild1@gmail.com>2022-03-21 12:36:38 +0000
commitdd249a17cab3928cdcd695ff7ecbf4ca6bd227b0 (patch)
tree30865450be16fbcaf9897e9e443e4cf59dc1555a
parent28e919462b81de447b08c490f9879234642d2200 (diff)
parentea9ea679110d161e12d7be441258307a461f2150 (diff)
downloadprosody-dd249a17cab3928cdcd695ff7ecbf4ca6bd227b0.tar.gz
prosody-dd249a17cab3928cdcd695ff7ecbf4ca6bd227b0.zip
Merge 0.12->trunk
-rw-r--r--plugins/mod_pubsub/mod_pubsub.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua
index db615035..ef31f326 100644
--- a/plugins/mod_pubsub/mod_pubsub.lua
+++ b/plugins/mod_pubsub/mod_pubsub.lua
@@ -84,7 +84,7 @@ function simple_broadcast(kind, node, jids, item, actor, node_obj, service) --lu
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