aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_storage_sql2.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-05-09 23:35:54 +0200
committerKim Alvefur <zash@zash.se>2014-05-09 23:35:54 +0200
commit58b46e2d6c3230cbef1bf62f90da3a9d329c1dea (patch)
treeb18cb027c5578a9efd74e0e4bea0b0d4401abdec /plugins/mod_storage_sql2.lua
parent4085591233dccaa78abdbf8a43007f08c8426d5e (diff)
parent3cfe230bd0725c3c3cc3aacb97f11edf12da8305 (diff)
downloadprosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.tar.gz
prosody-58b46e2d6c3230cbef1bf62f90da3a9d329c1dea.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_storage_sql2.lua')
-rw-r--r--plugins/mod_storage_sql2.lua2
1 files changed, 1 insertions, 1 deletions
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;