OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

For single instance, allow domain present & match

pull/2379/head
David Baker 2016-10-04 15:30:46 +01:00
parent de9bf4bb47
commit c0a4574069
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/structures/RoomDirectory.js
View File

@ -508,7 +508,16 @@ module.exports = React.createClass({
// If there's only one instance in this protocol, use it // If there's only one instance in this protocol, use it
// as long as it has no domain (which we assume to mean it's // as long as it has no domain (which we assume to mean it's
// there is only one possible instance). // there is only one possible instance).
if (the_instance.fields.domain === undefined && network_info.domain === undefined) { if (
(
the_instance.fields.domain === undefined &&
network_info.domain === undefined
) ||
(
the_instance.fields.domain !== undefined &&
the_instance.fields.domain == network_info.domain
)
) {
matched_instance = the_instance; matched_instance = the_instance;
} }
} else if (network_info.domain) { } else if (network_info.domain) {