about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-02-16 14:53:27 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-02-16 14:53:27 +0100
commit041ff5fa9a45f7b8d1048a05a35611622b6f5fdb (patch)
treed5791b3c5a302e2f84405b5e70c41a7f9bdaad79
parentea7ad59af20af2aa6817b3b40dca34c8fba3373a (diff)
Fix crash on public hashtag pages when streaming fails (#10061)
-rw-r--r--app/javascript/mastodon/features/status/components/detailed_status.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 734353c9b..49bc43a7b 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -87,7 +87,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
   }
 
   render () {
-    const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+    const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
     const { compact } = this.props;