diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-24 16:01:39 +0100 |
| commit | d3eec6f983f8524e28e8ffe42ba3a10efaa0a30e (patch) | |
| tree | 4c9cd3a9709a18a46d179e4af63bc7bcfa117b66 /app/views/admin_request | |
| parent | cc3da49bc927175a49d7150b98d762f65e143d21 (diff) | |
| parent | d3aae5cc48c92473e06b2104bb9431305d5a92f0 (diff) | |
Merge branch 'release/0.9' into rails-3-develop
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
Diffstat (limited to 'app/views/admin_request')
| -rw-r--r-- | app/views/admin_request/show.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb index 9cbcb68f0..e18e319be 100644 --- a/app/views/admin_request/show.html.erb +++ b/app/views/admin_request/show.html.erb @@ -258,7 +258,7 @@ </td> <td> <% if column_name == 'body' %> - <%= simple_format(truncate(outgoing_message.body, :length => 400, :omission => link_to("...", "#", :class => "toggle-hidden" ))) %> + <%= simple_format(truncate(h(outgoing_message.body), :length => 400, :omission => link_to("...", "#", :class => "toggle-hidden" )).html_safe) %> <div style="display:none;"><%= simple_format( outgoing_message.body ) %></div> <% else %> <%= admin_value(value) %> @@ -303,7 +303,7 @@ </td> <td> <% if column_name =~ /^cached_.*?$/ %> - <%= simple_format( truncate(value, :length => 400, :omission => link_to("...", "#", :class => "toggle-hidden"))) %> + <%= simple_format( truncate(h(value), :length => 400, :omission => link_to("...", "#", :class => "toggle-hidden")).html_safe) %> <div style="display:none;"><%= simple_format(value) %></div> <% else %> <%= simple_format(value.to_s) %> |