diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
| commit | 0f44b53c15ed12d163902afaf93a88442d4c97d2 (patch) | |
| tree | 3cea0291902a5fcdc82a59e5fe1747c4f8217900 /prosody | |
| parent | 11a3a158eb42284dd3585e04439f38ee3e6d548c (diff) | |
| parent | 64440086ea5ee8d2f1726f2101ced46d4f08b929 (diff) | |
| download | prosody-0f44b53c15ed12d163902afaf93a88442d4c97d2.tar.gz prosody-0f44b53c15ed12d163902afaf93a88442d4c97d2.zip | |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
| -rwxr-xr-x | prosody | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -207,8 +207,8 @@ function init_global_state() prosody.full_sessions = full_sessions; prosody.hosts = hosts; - local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; - local custom_plugin_paths = config.get("*", "core", "plugin_paths"); + local data_path = config.get("*", "data_path") or CFG_DATADIR or "data"; + local custom_plugin_paths = config.get("*", "plugin_paths"); if custom_plugin_paths then local path_sep = package.config:sub(3,3); -- path1;path2;path3;defaultpath... |