Mercurial > prosody-hg
comparison core/configmanager.lua @ 4797:e239668aa6d2
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2012 02:10:55 +0100 |
| parents | 40905e7bf680 |
| children | 85b2689dbcfe |
comparison
equal
deleted
inserted
replaced
| 4796:04a34287dc12 | 4797:e239668aa6d2 |
|---|---|
| 39 function getconfig() | 39 function getconfig() |
| 40 return config; | 40 return config; |
| 41 end | 41 end |
| 42 | 42 |
| 43 function get(host, section, key) | 43 function get(host, section, key) |
| 44 if not key then | |
| 45 section, key = "core", section; | |
| 46 end | |
| 44 local sec = config[host][section]; | 47 local sec = config[host][section]; |
| 45 if sec then | 48 if sec then |
| 46 return sec[key]; | 49 return sec[key]; |
| 47 end | 50 end |
| 48 return nil; | 51 return nil; |
