Software / code / prosody
Changeset
8001:247a544f7047
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 23 Mar 2017 14:46:41 +0100 |
| parents | 7999:980606856882 (current diff) 8000:42dd766cfe97 (diff) |
| children | 8004:5b5c0142fc46 |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_mam/mod_mam.lua Thu Mar 23 01:30:58 2017 +0100 +++ b/plugins/mod_mam/mod_mam.lua Thu Mar 23 14:46:41 2017 +0100 @@ -35,10 +35,6 @@ local m_min = math.min; local timestamp, timestamp_parse = require "util.datetime".datetime, require "util.datetime".parse; local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50); -local global_default_policy = module:get_option_string("default_archive_policy", true); -if global_default_policy ~= "roster" then - global_default_policy = module:get_option_boolean("default_archive_policy", global_default_policy); -end 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"); @@ -222,10 +218,6 @@ -- Below could be done by a metatable local default = prefs[false]; module:log("debug", "%s's default rule is %s", user, tostring(default)); - if default == nil then - default = global_default_policy; - module:log("debug", "Using global default rule, %s", tostring(default)); - end if default == "roster" then return has_in_roster(user, who); end
