Comparison

plugins/muc/mod_muc.lua @ 5381:30484214d49b

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 23 Mar 2013 04:17:39 +0100
parent 5376:ba9be0be4bbb
child 5500:eeea0eb2602a
comparison
equal deleted inserted replaced
5369:a344c1120e2b 5381:30484214d49b
28 local jid_bare = require "util.jid".bare; 28 local jid_bare = require "util.jid".bare;
29 local st = require "util.stanza"; 29 local st = require "util.stanza";
30 local uuid_gen = require "util.uuid".generate; 30 local uuid_gen = require "util.uuid".generate;
31 local datamanager = require "util.datamanager"; 31 local datamanager = require "util.datamanager";
32 local um_is_admin = require "core.usermanager".is_admin; 32 local um_is_admin = require "core.usermanager".is_admin;
33 local hosts = hosts; 33 local hosts = prosody.hosts;
34 34
35 rooms = {}; 35 rooms = {};
36 local rooms = rooms; 36 local rooms = rooms;
37 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {}; 37 local persistent_rooms = datamanager.load(nil, muc_host, "persistent") or {};
38 38