logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: ecfa1c3f3bbe02fa619ac000da51eccd3acbdc8a
parent: b3af3f9f8cd5ed9c7ee06452e981b1b7734e1d89
Author: MitarashiDango <MitarashiDango@users.noreply.github.com>
Date:   Wed,  4 Oct 2017 23:28:39 +0900

fix error (When part of conversation  has already been deleted.) (#5216)


Diffstat:

Mapp/javascript/mastodon/actions/timelines.js2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/actions/timelines.js b/app/javascript/mastodon/actions/timelines.js @@ -37,7 +37,7 @@ export function updateTimeline(timeline, status) { if (status.in_reply_to_id) { let parent = getState().getIn(['statuses', status.in_reply_to_id]); - while (parent.get('in_reply_to_id')) { + while (parent && parent.get('in_reply_to_id')) { parents.push(parent.get('id')); parent = getState().getIn(['statuses', parent.get('in_reply_to_id')]); }