diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
| commit | ccb5e87519070a995cfad8090f517d4273cbeec9 (patch) | |
| tree | b18cb027c5578a9efd74e0e4bea0b0d4401abdec /plugins | |
| parent | eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b (diff) | |
| parent | cb8d6cd008a01a8fc7427c9489a2366e17e88a62 (diff) | |
| download | prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.tar.gz prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_storage_sql.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_storage_sql2.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua index 1f453d42..7b810ab8 100644 --- a/plugins/mod_storage_sql.lua +++ b/plugins/mod_storage_sql.lua @@ -49,7 +49,7 @@ local function db2uri(params) end -local resolve_relative_path = require "core.configmanager".resolve_relative_path; +local resolve_relative_path = require "util.paths".resolve_relative_path; local function test_connection() if not connection then return nil; end diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua index 7414e5ed..249c72a7 100644 --- a/plugins/mod_storage_sql2.lua +++ b/plugins/mod_storage_sql2.lua @@ -2,7 +2,7 @@ local json = require "util.json"; local xml_parse = require "util.xml".parse; local uuid = require "util.uuid"; -local resolve_relative_path = require "core.configmanager".resolve_relative_path; +local resolve_relative_path = require "util.paths".resolve_relative_path; local stanza_mt = require"util.stanza".stanza_mt; local getmetatable = getmetatable; |