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

2017-07-12 10:46:15 +02:00
parent f4bca0f9c0 7f5c301734
commit c0cb5c4263
22 changed files with 545 additions and 242 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1657,7 +1657,7 @@ define([
                content: Messages.user_rename
            });
        }
-        if (account) {
+        if (account && parsed && (!parsed.type || parsed.type !== 'profile')) {
            options.push({
                tag: 'a',
                attributes: {'class': 'profile'},