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/favorite_button/favorite_button.js
+++ b/src/components/favorite_button/favorite_button.js
@ -2,7 +2,9 @@ const FavoriteButton = {
  props: ['status', 'loggedIn'],
  data () {
    return {
-      hidePostStatsLocal: this.$store.state.config.hidePostStats,
+      hidePostStatsLocal: typeof this.$store.state.config.hidePostStats == 'undefined'
+        ? this.$store.state.instance.hidePostStats
+        : this.$store.state.config.hidePostStats,
      animated: false
    }
  },