From 75d65197d0ad7c88a4ef93095a306ac1c16200fa Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Mon, 25 Oct 2010 01:10:20 +0200 Subject: [PATCH] Don't use display name for links. Use .title instead. Solves bug 25632 --- app/views/articles/image.html.haml | 2 +- app/views/layout/_footmenu_simple.html.haml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/articles/image.html.haml b/app/views/articles/image.html.haml index ea97fd5..494b63c 100644 --- a/app/views/articles/image.html.haml +++ b/app/views/articles/image.html.haml @@ -10,4 +10,4 @@ %a{:href => @image.original_url.force_encoding("UTF-8")}= language_object["download_full_version"] %p.authorship - %a{:href => temp_url(@image.display_name)}= language_object["author_link"] \ No newline at end of file + %a{:href => temp_url(@image.title)}= language_object["author_link"] diff --git a/app/views/layout/_footmenu_simple.html.haml b/app/views/layout/_footmenu_simple.html.haml index 32f29e6..12a7807 100644 --- a/app/views/layout/_footmenu_simple.html.haml +++ b/app/views/layout/_footmenu_simple.html.haml @@ -13,17 +13,17 @@ %br> %span.idx 3 - if @article - %a{:href => temp_url(@article.display_name), :accesskey => "3"}= language_object["regular_wikipedia"] + %a{:href => temp_url(@article.title), :accesskey => "3"}= language_object["regular_wikipedia"] - else %a{:href => temp_url(""), :accesskey => "3"}= language_object["regular_wikipedia"] -# 4 is Talk, 6 Hist - if @article %br> %span.idx 5 - %a{:href => action_url(@article.display_name, "edit"), :accesskey => "5"}= language_object["nav_edit"] + %a{:href => action_url(@article.title, "edit"), :accesskey => "5"}= language_object["nav_edit"] %br> %span.idx 6 - %a{:href => action_url(@article.display_name, "history"), :accesskey => "6"}= language_object["nav_history"] + %a{:href => action_url(@article.title, "history"), :accesskey => "6"}= language_object["nav_history"] %br> %span.idx 8 %a{:href => "#footmenu", :accesskey => "8"}= language_object["nav_end"]