pleroma-fe

commit: 502a76be0aa54edd23b4db58b3af90c57f0771cf
parent: 85e2ca4a0a5e74a2b38c5f7ccea5288fbebb2cfe
Author: lambda <pleromagit@rogerbraun.net>
Date:   Tue, 15 Jan 2019 20:16:11 +0000

Merge branch 'summary-html' into 'develop'

Sync with backend: Use summary_html.

See merge request pleroma/pleroma-fe!463
Diffstat:
M
src/components/status/status.vue
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -88,7 +88,7 @@
           <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper">
             <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a>
             <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div>
-            <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary" v-else></div>
+            <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div>
             <a v-if="hideSubjectStatus" href="#" class="cw-status-hider" @click.prevent="toggleShowMore">Show more</a>
             <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
           </div>