diff options
| author | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-26 17:50:41 +0200 |
| commit | 0ab828bb30e70e190c1b26eda658ea1d14cc129f (patch) | |
| tree | 5b6816dbc839a0cf821a6b4945fb0a81c109b0f2 /src/components/attachment | |
| parent | 3978aaef84cc023908155343af76983f2715cf90 (diff) | |
| parent | 8197c77f75929aad557c98a5f698159b1a6d0c90 (diff) | |
Merge develop and fix conflict
Diffstat (limited to 'src/components/attachment')
| -rw-r--r-- | src/components/attachment/attachment.js | 2 | ||||
| -rw-r--r-- | src/components/attachment/attachment.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 0ae8f71a..47939852 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -14,7 +14,7 @@ const Attachment = { ], data () { return { - nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage, + nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage, hideNsfwLocal: this.$store.state.config.hideNsfw, preloadImage: this.$store.state.config.preloadImage, loading: false, diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 56a49d2d..5a80db8a 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -27,7 +27,7 @@ :href="attachment.url" target="_blank" :title="attachment.description" > - <StillImage referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/> + <StillImage :referrerpolicy="referrerpolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/> </a> <a class="video-container" |