diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-30 16:37:06 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-30 16:37:06 +0100 |
| commit | dd39dbc580b1447758a6d3b9231ce09c9b3dcdf3 (patch) | |
| tree | cbe46b2e859aa6f59d39a110d997274091004a24 /app/helpers/link_to_helper.rb | |
| parent | 30c2eeb997d0e676f66015445fd9fc85dc9df5eb (diff) | |
| parent | 62a20d6696275a6f83ca4cf835c487873ca89c99 (diff) | |
Merge branch 'release/0.6.5' into wdtk
Diffstat (limited to 'app/helpers/link_to_helper.rb')
| -rwxr-xr-x | app/helpers/link_to_helper.rb | 2 |
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)) |