diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2006-12-26 21:15:28 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2006-12-26 21:15:28 +0000 |
| commit | 0820e745d65b7a2f197df1a6128fe7cc196fc940 (patch) | |
| tree | cd616f0d0a1ce3e38c78a24da0878560623e0212 /app | |
| parent | 2197fa3120e28f32249bf50bf850b6b4abfabf34 (diff) | |
| download | redmine-0820e745d65b7a2f197df1a6128fe7cc196fc940.tar.gz redmine-0820e745d65b7a2f197df1a6128fe7cc196fc940.zip | |
textile for revisions comments
git-svn-id: http://redmine.rubyforge.org/svn/trunk@125 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/repositories/revision.rhtml | 2 | ||||
| -rw-r--r-- | app/views/repositories/revisions.rhtml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 29494d707..397b747d5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -85,7 +85,7 @@ module ApplicationHelper end
def textilizable(text)
- $RDM_TEXTILE_DISABLED ? text : RedCloth.new(text).to_html
+ $RDM_TEXTILE_DISABLED ? simple_format(auto_link(h(text))) : RedCloth.new(h(text)).to_html
end
def error_messages_for(object_name, options = {})
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml index 6a5a20d97..19e980825 100644 --- a/app/views/repositories/revision.rhtml +++ b/app/views/repositories/revision.rhtml @@ -9,7 +9,7 @@ <h2><%= l(:label_revision) %> <%= @revision.identifier %></h2>
<p><em><%= @revision.author %>, <%= format_time(@revision.time) %></em></p>
-<%= simple_format @revision.message %>
+<%= textilizable @revision.message %>
<div style="float:right;">
<div class="square action_A"></div> <div style="float:left;"><%= l(:label_added) %> </div>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml index c2e30d30c..851c85858 100644 --- a/app/views/repositories/revisions.rhtml +++ b/app/views/repositories/revisions.rhtml @@ -29,7 +29,7 @@ <th align="center"><%= link_to revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier %></th>
<td align="center"><em><%=h revision.author %></em></td>
<td align="center"><%= format_time(revision.time) %></td>
-<td width="70%"><%= simple_format(h(revision.message)) %></td>
+<td width="70%"><%= textilizable(revision.message) %></td>
<td align="center"><%= link_to 'Diff', :action => 'diff', :id => @project, :path => @path, :rev => revision.identifier if @entry.is_file? && revision != @revisions.last %></td>
</tr>
<% end %>
|