diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 19:40:48 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-07-21 19:40:48 -0600 |
| commit | 63511316be51f193d37c4f3b9dd3455a9ab60de8 (patch) | |
| tree | 74986ed982d37b06256d5d2501d609314ba52e4e /modules/user/views | |
| parent | 7f9e71d8cdcf99267adc2b4a6332e379a0fca0fc (diff) | |
| parent | f533aee1cc71e8db739406859ac0cf43dce030ec (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/user/views')
| -rw-r--r-- | modules/user/views/login.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/user/views/login.html.php b/modules/user/views/login.html.php index 7617d131..10ed31b2 100644 --- a/modules/user/views/login.html.php +++ b/modules/user/views/login.html.php @@ -12,10 +12,10 @@ '<a href="' . url::site("form/edit/users/{$user->id}") . '" title="' . t("Edit Your Profile") . '" id="gUserProfileLink" class="gDialogLink">' . - p::clean(empty($user->full_name) ? $user->name : $user->full_name) . '</a>')) ?> + p::clean($user->display_name()) . '</a>')) ?> </li> <li> - <a href="<?= url::site("logout?csrf=$csrf&continue=" . url::current(true)) ?>" + <a href="<?= url::site("logout?csrf=$csrf&continue=" . urlencode(url::current(true))) ?>" id="gLogoutLink"><?= t("Logout") ?></a> </li> <? endif ?> |