aboutsummaryrefslogtreecommitdiffstats
path: root/app/helpers/link_to_helper.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-08-30 17:49:28 +0100
committerLouise Crow <louise.crow@gmail.com>2012-08-30 17:49:28 +0100
commit74531a783a8ea62a80596b435bd151cec2bf82c8 (patch)
treef0d27526768e6a50d1fccf17e5a723324441bb13 /app/helpers/link_to_helper.rb
parentee723d9e6645bc7987cb2b7cc9cd320950536201 (diff)
parent62a20d6696275a6f83ca4cf835c487873ca89c99 (diff)
Merge branch 'release/0.6.5'0.6.5
Diffstat (limited to 'app/helpers/link_to_helper.rb')
-rwxr-xr-xapp/helpers/link_to_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 16e37277b..cae17ebd3 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -118,7 +118,7 @@ module LinkToHelper
def user_admin_link_for_request(request, external_text=nil, internal_text=nil)
if request.is_external?
- text = external_text ? external_text : request.user_name + " (external)"
+ text = external_text ? external_text : (request.external_user_name || _("Anonymous user")) + " (external)"
else
text = internal_text ? internal_text : request.user.name
link_to(h(text), user_admin_url(request.user))