tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged upstream PR #4526

Browse Source
This commit is contained in:
Ondřej Hruška committed 2017-08-06 21:23:36 +02:00
1 parent 7b42d14f45
commit 811d895f7b
13 files changed
+82 -23
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/mastodon/components/status.js
+2 -2
View File
@@ -231,9 +231,9 @@ export default class Status extends ImmutablePureComponent {
}
if (account === undefined || account === null) {
statusAvatar = <Avatar src={status.getIn(['account', 'avatar'])} staticSrc={status.getIn(['account', 'avatar_static'])} size={48} />;
statusAvatar = <Avatar account={status.get('account')} size={48} />;
}else{
statusAvatar = <AvatarOverlay staticSrc={status.getIn(['account', 'avatar_static'])} overlaySrc={account.get('avatar_static')} />;
statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
}
return (