Mercurial > prosody-hg
comparison core/modulemanager.lua @ 675:cc82394fea22
Automated merge with http://waqas.ath.cx:8000/
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 07 Jan 2009 15:14:24 +0000 |
| parents | 4f506c627b49 7db1044d2fab |
| children | 13ed38531f69 |
comparison
equal
deleted
inserted
replaced
| 674:4f506c627b49 | 675:cc82394fea22 |
|---|---|
| 78 | 78 |
| 79 -- Load modules from just this host | 79 -- Load modules from just this host |
| 80 local modules_enabled = config.get(host, "core", "modules_enabled"); | 80 local modules_enabled = config.get(host, "core", "modules_enabled"); |
| 81 if modules_enabled then | 81 if modules_enabled then |
| 82 for _, module in pairs(modules_enabled) do | 82 for _, module in pairs(modules_enabled) do |
| 83 load(host, module); | 83 if not is_loaded(host, module) then |
| 84 load(host, module); | |
| 85 end | |
| 84 end | 86 end |
| 85 end | 87 end |
| 86 end | 88 end |
| 87 eventmanager.add_event_hook("host-activated", load_modules_for_host); | 89 eventmanager.add_event_hook("host-activated", load_modules_for_host); |
| 88 -- | 90 -- |
