Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'

make nsfw censor image configurable See merge request pleroma/pleroma-fe!243
2018-12-13 15:04:55 +00:00 · 2018-12-13 15:04:55 +00:00 · aa7cff92aa
commit aa7cff92aa
parent 25a88da17a f4ee222e3c
2 changed files with 4 additions and 1 deletions
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -11,7 +11,7 @@ const Attachment = {
  ],
  data () {
    return {
-      nsfwImage,
+      nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
      hideNsfwLocal: this.$store.state.config.hideNsfw,
      preloadImage: this.$store.state.config.preloadImage,
      loopVideo: this.$store.state.config.loopVideo,