OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3223 from matrix-org/dbkr/fix-powerlevels-crash-2 

Check content and content.users in power levels
pull/21833/head
David Baker 2019-07-15 17:23:43 +01:00 committed by GitHub
parent a8ccd6dfd7 02ec96cff1
commit 3809134d73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/TextForEvent.js
View File

@ -416,7 +416,8 @@ function textForEncryptionEvent(event) {
// Currently will only display a change if a user's power level is changed // Currently will only display a change if a user's power level is changed
function textForPowerEvent(event) { function textForPowerEvent(event) {
const senderName = event.sender ? event.sender.name : event.getSender(); const senderName = event.sender ? event.sender.name : event.getSender();
if (!event.getPrevContent() || !event.getPrevContent().users) { if (!event.getPrevContent() || !event.getPrevContent().users ||
!event.getContent() || !event.getContent().users) {
return ''; return '';
} }
const userDefault = event.getContent().users_default || 0; const userDefault = event.getContent().users_default || 0;