From: Kim Alvefur <zash@zash.se>
Date: Sat, 30 Apr 2016 15:25:06 +0000 (+0200)
Subject: MUC: Restore last message from state, not room config (missing change from cbb05b454c13)
X-Git-Url: https://git.enpas.org/?p=prosody.git;a=commitdiff_plain;h=443d34ba0f28260d9351e4bef0bdf90fdc0dca07

MUC: Restore last message from state, not room config (missing change from cbb05b454c13)
---

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