Software / code / prosody
Changeset
8049:0909de054b3f
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 02 Apr 2017 23:06:27 +0200 |
| parents | 8046:1bf47706aefb (current diff) 8048:75e37366a03f (diff) |
| children | 8051:b2681397bafa |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.luacheckrc Sun Apr 02 00:24:37 2017 +0200 +++ b/.luacheckrc Sun Apr 02 23:06:27 2017 +0200 @@ -23,7 +23,6 @@ "module.event_handlers", "module.reloading", "module.saved_state", - "module.environment", "module.global", "module.path", @@ -87,6 +86,7 @@ "module.save", "module.restore", "module.command", + "module.environment", }; } files["tests/"] = {
--- a/plugins/mod_mam/mod_mam.lua Sun Apr 02 00:24:37 2017 +0200 +++ b/plugins/mod_mam/mod_mam.lua Sun Apr 02 23:06:27 2017 +0200 @@ -38,7 +38,7 @@ local strip_tags = module:get_option_set("dont_archive_namespaces", { "http://jabber.org/protocol/chatstates" }); local archive_store = module:get_option_string("archive_store", "archive"); -local archive = assert(module:open_store(archive_store, "archive")); +local archive = module:open_store(archive_store, "archive"); if archive.name == "null" or not archive.find then if not archive.find then
