From 9cc0faa4e67ff2ccbc057afa434eca15b86a1be4 Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Wed, 20 May 2015 22:40:53 +0200
Subject: [PATCH] fixes reshares with no text but with photo
regression from 1da1c53f203e6eb9dad50872e573a4965219ef92
closes #5976
---
app/assets/templates/status-message_tpl.jst.hbs | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/app/assets/templates/status-message_tpl.jst.hbs b/app/assets/templates/status-message_tpl.jst.hbs
index f6689bf30c..cf576b8532 100644
--- a/app/assets/templates/status-message_tpl.jst.hbs
+++ b/app/assets/templates/status-message_tpl.jst.hbs
@@ -18,12 +18,16 @@
<div class="markdown-content">
{{#if text}}
{{{text}}}
- {{else if isReshare}}
- <div class="reshare">
- <p>
- {{t "stream.original_post_deleted"}}
- </p>
- </div>
+ {{else}}
+ {{#unless largePhoto}}
+ {{#if isReshare}}
+ <div class="reshare">
+ <p>
+ {{t "stream.original_post_deleted"}}
+ </p>
+ </div>
+ {{/if}}
+ {{/unless}}
{{/if}}
</div>
<div class="oembed"></div>
--
GitLab