1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate
2018-09-28 12:20:55 +00:00

View File

@@ -286,6 +286,14 @@ export default React.createClass({
register_hs_url: paramHs, register_hs_url: paramHs,
}); });
} }
// Set a default IS with query param `is_url`
const paramIs = this.props.startingFragmentQueryParams.is_url;
if (paramIs) {
console.log('Setting register_is_url ', paramIs);
this.setState({
register_is_url: paramIs,
});
}
// a thing to call showScreen with once login completes. this is kept // a thing to call showScreen with once login completes. this is kept
// outside this.state because updating it should never trigger a // outside this.state because updating it should never trigger a