diff options
| author | Kim Alvefur <zash@zash.se> | 2017-04-02 23:06:27 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-04-02 23:06:27 +0200 |
| commit | b20964f83264e0f01132fcb09723e28c65f73fab (patch) | |
| tree | 358e773c362310c340614ec2915410dc3f490367 | |
| parent | 4aca019397008f0d14d445709610954e6cd56ad4 (diff) | |
| parent | bf96691bcc7ceeef346906259ebe901c09a6e876 (diff) | |
| download | prosody-b20964f83264e0f01132fcb09723e28c65f73fab.tar.gz prosody-b20964f83264e0f01132fcb09723e28c65f73fab.zip | |
Merge 0.10->trunk
| -rw-r--r-- | .luacheckrc | 2 | ||||
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.luacheckrc b/.luacheckrc index 8b1afa42..91face3f 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -23,7 +23,6 @@ files["plugins/"] = { "module.event_handlers", "module.reloading", "module.saved_state", - "module.environment", "module.global", "module.path", @@ -87,6 +86,7 @@ files["plugins/"] = { "module.save", "module.restore", "module.command", + "module.environment", }; } files["tests/"] = { diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index 55572867..0c35f43f 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -38,7 +38,7 @@ local default_max_items, max_max_items = 20, module:get_option_number("max_archi 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 |