aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
committerKim Alvefur <zash@zash.se>2016-11-19 17:37:52 +0100
commitfa06e78161ae895c625f78ed745766d4569d6876 (patch)
treea4e4f275e9d2fa0c365a3f06ce1834356f37111c
parentc9778ba770df13acaf5e528b3f8905de108164e5 (diff)
parentc3a4324ff10f956611014f1550124db6aabc4941 (diff)
downloadprosody-fa06e78161ae895c625f78ed745766d4569d6876.tar.gz
prosody-fa06e78161ae895c625f78ed745766d4569d6876.zip
Merge 0.10->trunk
-rw-r--r--util/pubsub.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua
index e96df5fc..1db917d8 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -331,6 +331,7 @@ function service:get_items(node, actor, id)
else
local data = {}
for key, value in self.data[node]:items() do
+ data[#data+1] = key;
data[key] = value;
end
return true, data;