From: Stephen Burgess <stephenburgess8@gmail.com>
Date: Mon, 10 Apr 2017 19:31:26 +0000 (-0500)
Subject: Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=553170b77acea8867cb67deca7c24ce9e16c9c48;p=mastodon.git

Fix #1097 When onClick is falsy, do not make status content clickable (#1434)
---

diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx
index 6c25afdea..52826ace0 100644
--- a/app/assets/javascripts/components/components/status_content.jsx
+++ b/app/assets/javascripts/components/components/status_content.jsx
@@ -125,7 +125,7 @@ const StatusContent = React.createClass({
           <div style={{ display: hidden ? 'none' : 'block', ...directionStyle }} dangerouslySetInnerHTML={content} />
         </div>
       );
-    } else {
+    } else if (this.props.onClick) {
       return (
         <div
           className='status__content'
@@ -135,6 +135,14 @@ const StatusContent = React.createClass({
           dangerouslySetInnerHTML={content}
         />
       );
+    } else {
+      return (
+        <div
+          className='status__content'
+          style={{ ...directionStyle }}
+          dangerouslySetInnerHTML={content}
+        />
+      );
     }
   },