diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 15:12:16 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 15:12:16 +1100 |
| commit | 4e74f0fcdcb0820865689cc0595cf0c83aee7cab (patch) | |
| tree | 1fd4a83516acaad73d88f0d7f011caf045ab5a17 /app/controllers/services_controller.rb | |
| parent | 65680320bee44812394041492c8492e95b1a3d78 (diff) | |
| parent | a67666e34c280d2b9eb613f57d96ba4ee5fcd749 (diff) | |
Merge branch 'rails_xss' into rails-3-spike
Conflicts:
Gemfile
Gemfile.lock
config/environment.rb
lib/i18n_fixes.rb
Diffstat (limited to 'app/controllers/services_controller.rb')
| -rw-r--r-- | app/controllers/services_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb index 38bf51772..1db5348c7 100644 --- a/app/controllers/services_controller.rb +++ b/app/controllers/services_controller.rb @@ -25,7 +25,7 @@ class ServicesController < ApplicationController end end if !text.empty? - text += ' <span class="close-button">X</span>' + text += ' <span class="close-button">X</span>'.html_safe end render :text => text, :content_type => "text/plain" # XXX workaround the HTML validation in test suite end |