summaryrefslogtreecommitdiffstats
path: root/webapp/components/signup
diff options
context:
space:
mode:
authorDavid Lu <david.lu97@outlook.com>2016-08-23 02:34:45 -0400
committerCorey Hulen <corey@hulen.com>2016-08-22 22:34:45 -0800
commitc93ce7af3fc89ba3f76517245d18f55b238beb11 (patch)
treef9cf4736e0a52e34f2d2739f72ab7c75bf3a8f70 /webapp/components/signup
parent4780724eadeb6602950f09853cfc48a10c0f0366 (diff)
downloadchat-c93ce7af3fc89ba3f76517245d18f55b238beb11.tar.gz
chat-c93ce7af3fc89ba3f76517245d18f55b238beb11.tar.bz2
chat-c93ce7af3fc89ba3f76517245d18f55b238beb11.zip
fixed signup (#3858)
Diffstat (limited to 'webapp/components/signup')
-rw-r--r--webapp/components/signup/signup_controller.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/signup/signup_controller.jsx b/webapp/components/signup/signup_controller.jsx
index a0587bba9..67d3b0c4f 100644
--- a/webapp/components/signup/signup_controller.jsx
+++ b/webapp/components/signup/signup_controller.jsx
@@ -33,11 +33,12 @@ export default class SignupController extends React.Component {
if (props.location.query) {
loading = true;
const hash = props.location.query.h;
+ const inviteId = props.location.query.id;
if (hash && hash.length > 0 && !UserStore.getCurrentUser()) {
usedBefore = BrowserStore.getGlobalItem(hash);
loading = false;
- } else if (global.window.mm_config.EnableOpenServer !== 'true' && !UserStore.getNoAccounts()) {
+ } else if (!inviteId && global.window.mm_config.EnableOpenServer !== 'true' && !UserStore.getNoAccounts()) {
noOpenServerError = true;
loading = false;
serverError = (