diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-22 17:34:51 +0100 |
| commit | e98bfd6e9ed7e6bb151d0eb5c216cad0fed6a40c (patch) | |
| tree | 222e151cf7ee87a06824553b2b53b2053c8f10a4 /app/controllers/application_controller.rb | |
| parent | da70b7b4f58be9d78afba9ec6045d18094ea9581 (diff) | |
| parent | bc73110b230e607d4d7e5acae467790845784704 (diff) | |
Merge branch 'release/0.6.3'0.6.3
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 41adf1848..11f21025c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -27,6 +27,7 @@ class ApplicationController < ActionController::Base before_filter :check_in_post_redirect before_filter :session_remember_me before_filter :set_vary_header + before_filter :set_popup_banner # scrub sensitive parameters from the logs filter_parameter_logging :password @@ -553,6 +554,9 @@ class ApplicationController < ActionController::Base return country end + def set_popup_banner + @popup_banner = render_to_string(:partial => "general/popup_banner").strip + end # URL generating functions are needed by all controllers (for redirects), # views (for links) and mailers (for use in emails), so include them into # all of all. |