From b7f1e2b926c2ff952af0b5ef452b0f9bfd693bce Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 30 Apr 2016 17:25:06 +0200
Subject: MUC: Restore last message from state, not room config (missing change
from cbb05b454c13)
---
plugins/muc/muc.lib.lua | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'plugins/muc')
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index fea0ba93..238cd3e1 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1343,10 +1343,10 @@ function _M.restore_room(frozen, state)
local room_jid = frozen._jid;
local room = _M.new_room(room_jid, frozen._data);
- if frozen._last_message and frozen._last_message_at then
+ if state and state._last_message and state._last_message_at then
room._history = {
- { stanza = st.deserialize(frozen._last_message),
- timestamp = frozen._last_message_at, },
+ { stanza = st.deserialize(state._last_message),
+ timestamp = state._last_message_at, },
};
end
--
cgit v1.2.3