aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-23 14:46:41 +0100
committerKim Alvefur <zash@zash.se>2017-03-23 14:46:41 +0100
commitfcaed765157cd655ef028f74994bf4033912de2c (patch)
tree8b83e6ac3c8e3a44e10fa1f3f739fbcdf36d0a7c
parent597d3174276ee35ac59a7eb2109469126d054310 (diff)
parent4f82974fa80987ebe9b2ebc3c88564c529787903 (diff)
downloadprosody-fcaed765157cd655ef028f74994bf4033912de2c.tar.gz
prosody-fcaed765157cd655ef028f74994bf4033912de2c.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_mam/mod_mam.lua8
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua
index 7ea14502..55572867 100644
--- a/plugins/mod_mam/mod_mam.lua
+++ b/plugins/mod_mam/mod_mam.lua
@@ -35,10 +35,6 @@ local time_now = os.time;
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 @@ local function shall_store(user, who)
-- 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