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

Merge pull request #2680 from alexte/develop 

RoomDirectory Dropdown should use roomDirectory.servers
pull/21833/head
Travis Ralston 2019-02-21 19:01:44 -07:00 committed by GitHub
parent 86c49d5807 892802e9cc
commit d6f8f8a7ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/directory/NetworkDropdown.js
View File

@ -131,8 +131,8 @@ export default class NetworkDropdown extends React.Component {
const options = [];
let servers = [];
if (this.props.config.servers) {
servers = servers.concat(this.props.config.servers);
if (this.props.config.roomDirectory.servers) {
servers = servers.concat(this.props.config.roomDirectory.servers);
}
if (servers.indexOf(MatrixClientPeg.getHomeServerName()) == -1) {