diff options
| author | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
|---|---|---|
| committer | Qingping Hou <dave2008713@gmail.com> | 2013-02-25 17:16:03 -0500 |
| commit | 195b52cb63eda3d8e3af6195058a0e1403e4dede (patch) | |
| tree | 4c79947d856f136051a84171eba913b1517a3bd1 /core/templates/layout.user.php | |
| parent | c111a3aa248bee2bff22318c2a3d0da32ea0e451 (diff) | |
| parent | d713948d3f85a6e0a369bf1a9052ce563250e3da (diff) | |
| download | nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.tar.gz nextcloud-server-195b52cb63eda3d8e3af6195058a0e1403e4dede.zip | |
Merge branch 'master' of github.com:owncloud/core into issue_1776
Conflicts:
core/templates/layout.user.php
Diffstat (limited to 'core/templates/layout.user.php')
| -rw-r--r-- | core/templates/layout.user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 03e55594d67..7a677b88345 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -34,7 +34,7 @@ <ul id="settings" class="svg"> <span id="expand"> - <span id="expandDisplayName"><?php echo $_['displayname'] ?></span> + <span id="expandDisplayName"><?php echo $_['user_displayname'] ?></span> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> </span> <div id="expanddiv"> |