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

2017-04-28 17:13:18 +02:00
parent 28e4ef1b13 afb0061d7b
commit cf4dee28f7
4 changed files with 6 additions and 4 deletions
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -538,7 +538,7 @@ define([
        // User dropdown
        if (config.displayed.indexOf('useradmin') !== -1) {
            var userMenuCfg = {};
-            if (config.userData) {
+            if (!config.hideDisplayName) {
                userMenuCfg = {
                    displayNameCls: USERNAME_CLS,
                    changeNameButtonCls: USERBUTTON_CLS,