Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Check whether prev_content or prev_sender is set … #442

Merged
merged 2 commits into from
Dec 14, 2015

Conversation

NegativeMjark
Copy link
Contributor

…before trying to rollback state

"room_id": timeline_event.room_id,
})
prev_content = timeline_event.unsigned.get('prev_content')
prev_sender = timeline_event.unsigned.get('prev_sender')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move these lines to ~ line 354, and combine the two if conditions?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done 070e28e

NegativeMjark added a commit that referenced this pull request Dec 14, 2015
Check whether prev_content or prev_sender is set …
@NegativeMjark NegativeMjark merged commit 6051266 into release-v0.12.0 Dec 14, 2015
NegativeMjark added a commit that referenced this pull request Dec 14, 2015
@erikjohnston erikjohnston deleted the markjh/missing_prev_content branch January 12, 2016 16:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants