moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/favorites-timelines-fetching-on-direct-url' into 'develop' 

Fix #286 favs timeline fetching when opening profile via direct url

Closes #286

See merge request pleroma/pleroma-fe!495
This commit is contained in:
lambda 2019-01-29 19:10:33 +00:00
parent 3cfbf0141f 0a0dffa793
commit 43c26a4cd0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/user_profile/user_profile.js
View File

@ -36,7 +36,8 @@ const UserProfile = {
return this.$route.params.name || this.user.screen_name return this.$route.params.name || this.user.screen_name
}, },
isUs () { isUs () {
return this.userId === this.$store.state.users.currentUser.id return this.userId && this.$store.state.users.currentUser.id &&
this.userId === this.$store.state.users.currentUser.id
}, },
friends () { friends () {
return this.user.friends return this.user.friends