diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-07-05 13:28:15 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-07-05 13:28:15 +0000 |
| commit | 60b413d02c4be5b3f24ff984e43090620d9a59e1 (patch) | |
| tree | deea313b0182c1a6dbfed0e739d70042cac58e5a /src/components | |
| parent | 7ec02445cc9115b35f399b5c98bdcad00c6da5f4 (diff) | |
| parent | d8e210df4d3f6e83c1fa0fc9b893b825cec45da4 (diff) | |
Merge branch '602' into 'develop'
Fix mixed profiles bug on user profile page
Closes #586
See merge request pleroma/pleroma-fe!865
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/timeline/timeline.js | 2 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 9dafcbd8..b1c7edf8 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -86,7 +86,7 @@ const Timeline = { if (this.newStatusCount === 0) return if (this.timeline.flushMarker !== 0) { - this.$store.commit('clearTimeline', { timeline: this.timelineName }) + this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true }) this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 }) this.fetchOlderStatuses() } else { diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index eab330e7..7eb4ed3a 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -31,6 +31,8 @@ const UserProfile = { } }, created () { + // Make sure that timelines used in this page are empty + this.cleanUp() const routeParams = this.$route.params this.load(routeParams.name || routeParams.id) }, |