From bb405563c8c32a97d6b81a173f8a27afb4fba247 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 9 Jun 2016 10:54:56 +0100 Subject: [PATCH] Fix default servers --- src/components/structures/MatrixChat.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index cca7d1fd9f..6c41380751 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -99,9 +99,8 @@ module.exports = React.createClass({ return window.localStorage.getItem("mx_hs_url"); } else { - return this.props.config.default_hs_url + return this.props.config.default_hs_url || "https://matrix.org"; } - return "https://matrix.org"; }, getFallbackHsUrl: function() { @@ -118,9 +117,8 @@ module.exports = React.createClass({ return window.localStorage.getItem("mx_is_url"); } else { - return this.props.config.default_is_url + return this.props.config.default_is_url || "https://matrix.org" } - return "https://matrix.org"; }, componentWillMount: function() {