diff options
| author | Kim Alvefur <zash@zash.se> | 2016-04-30 17:25:06 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-04-30 17:25:06 +0200 |
| commit | b7f1e2b926c2ff952af0b5ef452b0f9bfd693bce (patch) | |
| tree | 116037967ac589ea6819045b37c65a7656eb7d7e /plugins | |
| parent | e1c897b8e3251493bfa2e9df38b7da90d94d3da8 (diff) | |
| download | prosody-b7f1e2b926c2ff952af0b5ef452b0f9bfd693bce.tar.gz prosody-b7f1e2b926c2ff952af0b5ef452b0f9bfd693bce.zip | |
MUC: Restore last message from state, not room config (missing change from cbb05b454c13)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/muc/muc.lib.lua | 6 |
1 files changed, 3 insertions, 3 deletions
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 |