diff options
| author | HJ <spam@hjkos.com> | 2019-01-24 18:13:07 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2019-01-24 18:13:07 +0000 |
| commit | 03ffa7e84e648f1114605c338e6b40c214199e9d (patch) | |
| tree | 5718da67b6cff88374111e7562b2d966b2b39934 /src/components/attachment/attachment.js | |
| parent | 8b7faa810693e85247a86d3a9fc1190afc33896b (diff) | |
| parent | f38da239d9d420d9ba3af25c67864bb015303fca (diff) | |
Merge branch 'fix-custom-nsfw-image' into 'develop'
fix custom nsfwCensorImage not working
See merge request pleroma/pleroma-fe!469
Diffstat (limited to 'src/components/attachment/attachment.js')
| -rw-r--r-- | src/components/attachment/attachment.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 18a03770..9212b74b 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -11,7 +11,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, loopVideo: this.$store.state.config.loopVideo, |