Mercurial > prosody-hg
comparison plugins/mod_storage_sql2.lua @ 6168:3942630b4e35
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 09 May 2014 23:35:54 +0200 |
| parents | 6a184b16b717 |
| children | bce801e40484 |
comparison
equal
deleted
inserted
replaced
| 6163:7a8899d314d7 | 6168:3942630b4e35 |
|---|---|
| 1 | 1 |
| 2 local json = require "util.json"; | 2 local json = require "util.json"; |
| 3 local xml_parse = require "util.xml".parse; | 3 local xml_parse = require "util.xml".parse; |
| 4 local uuid = require "util.uuid"; | 4 local uuid = require "util.uuid"; |
| 5 local resolve_relative_path = require "core.configmanager".resolve_relative_path; | 5 local resolve_relative_path = require "util.paths".resolve_relative_path; |
| 6 | 6 |
| 7 local stanza_mt = require"util.stanza".stanza_mt; | 7 local stanza_mt = require"util.stanza".stanza_mt; |
| 8 local getmetatable = getmetatable; | 8 local getmetatable = getmetatable; |
| 9 local t_concat = table.concat; | 9 local t_concat = table.concat; |
| 10 local function is_stanza(x) return getmetatable(x) == stanza_mt; end | 10 local function is_stanza(x) return getmetatable(x) == stanza_mt; end |
