Mercurial > prosody-hg
comparison plugins/mod_pubsub/mod_pubsub.lua @ 6450:25d86b0f2147
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 28 Sep 2014 03:08:03 +0200 |
| parents | 0f4025abbe8f 011ca9b88179 |
| children | ecd8d6437053 |
comparison
equal
deleted
inserted
replaced
| 6449:24cd03cd1847 | 6450:25d86b0f2147 |
|---|---|
| 216 | 216 |
| 217 set_affiliation = true; | 217 set_affiliation = true; |
| 218 }; | 218 }; |
| 219 }; | 219 }; |
| 220 | 220 |
| 221 node_config_form = require"util.dataforms".new { | |
| 222 { | |
| 223 type = "hidden"; | |
| 224 name = "FORM_TYPE"; | |
| 225 value = "http://jabber.org/protocol/pubsub#node_config"; | |
| 226 }; | |
| 227 { | |
| 228 type = "text-single"; | |
| 229 name = "pubsub#max_items"; | |
| 230 label = "Max # of items to persist"; | |
| 231 }; | |
| 232 }; | |
| 233 | |
| 234 autocreate_on_publish = autocreate_on_publish; | 221 autocreate_on_publish = autocreate_on_publish; |
| 235 autocreate_on_subscribe = autocreate_on_subscribe; | 222 autocreate_on_subscribe = autocreate_on_subscribe; |
| 236 | 223 |
| 237 broadcaster = simple_broadcast; | 224 broadcaster = simple_broadcast; |
| 238 get_affiliation = get_affiliation; | 225 get_affiliation = get_affiliation; |
