Merge branch 'stable' into develop

2015-05-21 00:46:59 +02:00 · 2015-05-21 00:46:59 +02:00 · 9b7a3c86e6
commit 9b7a3c86e6
parent 5a3b62d801 9cc0faa4e6
1 changed files with 10 additions and 6 deletions
--- a/app/assets/templates/status-message_tpl.jst.hbs
+++ b/app/assets/templates/status-message_tpl.jst.hbs
@ -18,13 +18,17 @@
  <div class="markdown-content">
    {{#if text}}
      {{{text}}}
-    {{else if isReshare}}
+    {{else}}
+      {{#unless largePhoto}}
+        {{#if isReshare}}
          <div class="reshare">
            <p>
              {{t "stream.original_post_deleted"}}
            </p>
          </div>
        {{/if}}
+      {{/unless}}
+    {{/if}}
  </div>
  <div class="oembed"></div>
  <div class="opengraph"></div>