diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-05-23 20:37:16 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-05-23 20:37:16 +0100 |
| commit | b5a72ce69dcaa31dc6e626956144c579c04fdc72 (patch) | |
| tree | 3f5de516b7b87f9a82f26861db6700c2a0320540 /plugins/muc/history.lib.lua | |
| parent | 9680214e3d4d8d853e83bbdb357601673dd6f2f6 (diff) | |
| parent | 9e8f0a984c05647db2346160d1cf62139560fefc (diff) | |
| download | prosody-b5a72ce69dcaa31dc6e626956144c579c04fdc72.tar.gz prosody-b5a72ce69dcaa31dc6e626956144c579c04fdc72.zip | |
Merge with daurnimator
Diffstat (limited to 'plugins/muc/history.lib.lua')
| -rw-r--r-- | plugins/muc/history.lib.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/muc/history.lib.lua b/plugins/muc/history.lib.lua index 596f92da..1c14cf84 100644 --- a/plugins/muc/history.lib.lua +++ b/plugins/muc/history.lib.lua @@ -11,7 +11,8 @@ local gettime = os.time; local datetime = require "util.datetime"; local st = require "util.stanza"; -local default_history_length, max_history_length = 20, math.huge; +local default_history_length = 20; +local max_history_length = module:get_option_number("max_history_messages", math.huge); local function set_max_history_length(_max_history_length) max_history_length = _max_history_length or math.huge; |