prosody
0011889c928f
util/pubsub.lua
Software / code / prosody
Comparison
util/pubsub.lua @ 7727:0011889c928f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 19 Nov 2016 17:37:52 +0100 |
| parent | 7704:5022e6181193 |
| parent | 7726:29c20eefa306 |
| child | 8211:5cbbe825d9d1 |
comparison
equal
deleted
inserted
replaced
| 7725:f928695a2af1 | 7727:0011889c928f |
|---|---|
| 329 if id then -- Restrict results to a single specific item | 329 if id then -- Restrict results to a single specific item |
| 330 return true, { id, [id] = self.data[node]:get(id) }; | 330 return true, { id, [id] = self.data[node]:get(id) }; |
| 331 else | 331 else |
| 332 local data = {} | 332 local data = {} |
| 333 for key, value in self.data[node]:items() do | 333 for key, value in self.data[node]:items() do |
| 334 data[#data+1] = key; | |
| 334 data[key] = value; | 335 data[key] = value; |
| 335 end | 336 end |
| 336 return true, data; | 337 return true, data; |
| 337 end | 338 end |
| 338 end | 339 end |
