summaryrefslogtreecommitdiff
path: root/modules/user/views
diff options
context:
space:
mode:
authorRomain LE DISEZ <romain.git@ledisez.net>2009-07-22 08:38:06 +0200
committerRomain LE DISEZ <romain.git@ledisez.net>2009-07-22 08:38:06 +0200
commit317b7b98c094386407251c2baf8f6e7c391c7bff (patch)
tree98898d791df3a10cf6f9c1c62fbce06d8c9a7de1 /modules/user/views
parent00b3ca82de3a4858745988943a46d07b1c0fd006 (diff)
parentf533aee1cc71e8db739406859ac0cf43dce030ec (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'modules/user/views')
-rw-r--r--modules/user/views/login.html.php4
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&amp;continue=" . urlencode(url::current(true))) ?>"
id="gLogoutLink"><?= t("Logout") ?></a>
</li>
<? endif ?>