diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-01 11:44:32 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-01-01 11:44:32 +0000 |
| commit | 56ca36ede13ddfc4d585476cef04cffc3238a34e (patch) | |
| tree | 7ce51744aa5668e5372caa6340ce9b8f78217138 /app/views/wiki | |
| parent | 29edbd605b12b0153f9197383838870fe8f7605f (diff) | |
| download | redmine-56ca36ede13ddfc4d585476cef04cffc3238a34e.tar.gz redmine-56ca36ede13ddfc4d585476cef04cffc3238a34e.zip | |
Rails3: view: html_safe for wiki/show.html.erb
Contributed by Sylvain Utard.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8453 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
| -rw-r--r-- | app/views/wiki/show.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index 25dfc1062..19215bb98 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -19,9 +19,9 @@ :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %> <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %> - <%= '(' + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff', + <%= '('.html_safe + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, - :version => @content.version) + ')' if @content.version > 1 %> - + :version => @content.version) + ')'.html_safe if @content.version > 1 %> - <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %> |