Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-09-11 08:54:34 +00:00
commit e99f42a743

View file

@ -318,7 +318,7 @@ module.exports = React.createClass({
// lazy load members if enabled
if (SettingsStore.isFeatureEnabled('feature_lazyloading')) {
room.loadMembersIfNeeded().catch((err) => {
const errorMessage = `Fetching room members for ${this.roomId} failed.` +
const errorMessage = `Fetching room members for ${room.roomId} failed.` +
" Room members will appear incomplete.";
console.error(errorMessage);
console.error(err);