aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-08-07 10:52:10 +0200
committerKim Alvefur <zash@zash.se>2018-08-07 10:52:10 +0200
commit5a5354e4223796fe682282d82ad3e6342d11c41c (patch)
tree2d910a9fccdcecd7dc95e314ed37ed8a9da300fe
parent052bd96a9fea3ff809a2804d955ce99b5985eeec (diff)
downloadprosody-5a5354e4223796fe682282d82ad3e6342d11c41c.tar.gz
prosody-5a5354e4223796fe682282d82ad3e6342d11c41c.zip
util.pubsub: Include node defaults from current service object
-rw-r--r--util/pubsub.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua
index b1aad71f..08b77790 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -633,6 +633,9 @@ function service:get_node_config(node, actor)
for k, v in pairs(default_node_config) do
config_table[k] = v;
end
+ for k, v in pairs(self.node_defaults) do
+ config_table[k] = v;
+ end
for k, v in pairs(node_obj.config) do
config_table[k] = v;
end