]> cat aescling's git repositories - mastodon.git/commitdiff
Fix /public showing public instead of community timeline for logged-in users (#13499)
authorThibG <thib@sitedethib.com>
Tue, 28 Apr 2020 07:43:45 +0000 (09:43 +0200)
committerGitHub <noreply@github.com>
Tue, 28 Apr 2020 07:43:45 +0000 (09:43 +0200)
app/views/public_timelines/show.html.haml

index 0e4ba877df61efbcec51b7de64a0f4fef7b92552..5e536a2356180270bcc02fd6da54877539dca737 100644 (file)
@@ -13,5 +13,5 @@
   - else
     %p= t('about.browse_local_posts')
 
-#mastodon-timeline{ data: { props: Oj.dump(default_props) }}
+#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(local: !Setting.show_known_fediverse_at_about_page)) }}
 #modal-container