aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-28 18:36:03 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-28 18:36:03 +0100
commit9570749b05e6306177708a3dfafa63cb49a499df (patch)
treed2267560b3dbd0d1e5397f6e83857528456e16be /plugins
parent30957d900de03520b693e9ee5d0310916e5600b4 (diff)
downloadprosody-9570749b05e6306177708a3dfafa63cb49a499df.tar.gz
prosody-9570749b05e6306177708a3dfafa63cb49a499df.zip
mod_muc/muc.lib: Fall back to default_history_length if no length in config
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 5170c94a..9be1736f 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -336,7 +336,7 @@ function room_mt:get_changesubject()
return self._data.changesubject;
end
function room_mt:get_historylength()
- return self._data.history_length
+ return self._data.history_length or default_history_length;
end
function room_mt:set_historylength(length)
if tonumber(length) == nil then