Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics

2018-10-16 14:09:29 +01:00 · 2018-10-16 14:09:29 +01:00 · 4cc1ed6171
commit 4cc1ed6171
parent 145929207e f554edc054
50 changed files with 2820 additions and 2257 deletions
--- a/src/components/user_card_content/user_card_content.js
+++ b/src/components/user_card_content/user_card_content.js
@ -5,7 +5,9 @@ export default {
  props: [ 'user', 'switcher', 'selected', 'hideBio' ],
  data () {
    return {
-      hideUserStatsLocal: this.$store.state.config.hideUserStats
+      hideUserStatsLocal: typeof this.$store.state.config.hideUserStats === 'undefined'
+        ? this.$store.state.instance.hideUserStats
+        : this.$store.state.config.hideUserStats
    }
  },
  computed: {