diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-02-14 16:48:08 +0000 |
| commit | d48bfd58f6ff26b2a34aa8d71d9d691f9fbc10e2 (patch) | |
| tree | c026e8e6639f7f9ceed92b75fb8ed657c566d788 /app/controllers/application_controller.rb | |
| parent | f8cf582f8c7461bfd680aac9c87cb5377c39c30c (diff) | |
| parent | 0747a2d66f65fd22d8ea275d9df29a7981a46d07 (diff) | |
Merge branch 'release/0.7' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a946526b8..ed1523f75 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -564,7 +564,7 @@ class ApplicationController < ActionController::Base end def set_popup_banner - @popup_banner = render_to_string(:partial => "general/popup_banner").strip + @popup_banner = render_to_string(:partial => "general/popup_banner").strip.html_safe end # URL generating functions are needed by all controllers (for redirects), # views (for links) and mailers (for use in emails), so include them into |