Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2018-06-21 14:08:18 +02:00 · 2018-06-21 14:08:18 +02:00 · 30beec0102
commit 30beec0102
parent d9c186a3da fc35d06c83
1 changed files with 3 additions and 1 deletions
--- a/customize.dist/login.js
+++ b/customize.dist/login.js
@ -268,7 +268,9 @@ define([
                                            proxy[Constants.displayNameKey] = uname;
                                        }
                                        LocalStore.eraseTempSessionValues();
-                                        proceed(result);
+                                        LocalStore.login(result.userHash, result.userName, function () {
+                                            setTimeout(function () { proceed(result); });
+                                        });
                                    });
                                });
                                break;