# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1418901350 -3600
# Node ID 3ac2b835c7b3e4058ee4eefc54c7a7f092e6ab31
# Parent  b51e596c5a02eb23cae33087a8127a64a73a0a10
mod_mam: Make sure default_archive_policy is a boolean or "roster" (thanks souliane)

diff -r b51e596c5a02 -r 3ac2b835c7b3 mod_mam/mod_mam.lua
--- a/mod_mam/mod_mam.lua	Thu Dec 11 20:43:14 2014 +0100
+++ b/mod_mam/mod_mam.lua	Thu Dec 18 12:15:50 2014 +0100
@@ -31,6 +31,9 @@
 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("default_archive_policy", false);
+if global_default_policy ~= "roster" then
+	global_default_policy = module:get_option_boolean("default_archive_policy", global_default_policy);
+end
 
 local archive_store = "archive2";
 local archive = module:open_store(archive_store, "archive");