Commit 64878ec6 authored by JC Brand's avatar JC Brand

Merge pull request #468 from 1st8/master

Fix [object Object] being sometimes shown as status
parents 0d4cf15f 1463e7cc
...@@ -4457,7 +4457,7 @@ ...@@ -4457,7 +4457,7 @@
if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) { if ((converse.connection.jid !== jid)&&(presence_type !== 'unavailable')) {
// Another resource has changed its status, we'll update ours as well. // Another resource has changed its status, we'll update ours as well.
converse.xmppstatus.save({'status': chat_status}); converse.xmppstatus.save({'status': chat_status});
if (status_message.length) { converse.xmppstatus.save({'status_message': status_message}); } if (status_message.length) { converse.xmppstatus.save({'status_message': status_message.text()}); }
} }
return; return;
} else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) { } else if (($presence.find('x').attr('xmlns') || '').indexOf(Strophe.NS.MUC) === 0) {
......
...@@ -5,6 +5,7 @@ Changelog ...@@ -5,6 +5,7 @@ Changelog
------------------ ------------------
* #462 Fix MUC rooms with names containing special characters not working [1st8] * #462 Fix MUC rooms with names containing special characters not working [1st8]
* #468 Fix [object Object] being sometimes shown as status [1st8]
0.9.5 (2015-08-24) 0.9.5 (2015-08-24)
------------------ ------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment