diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-11 15:15:15 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-11 15:15:15 -0700 |
| commit | b899d542efe424be83cf512c61e8cc0c5e3f0b1a (patch) | |
| tree | ea2ff3aca862efd7a2d9a2e41ebe872c3702ab3e /app/controllers/application_controller.rb | |
| parent | 7e0ff79a97d9085d60f88d9d211102a758eb3087 (diff) | |
| parent | e1d5d1fdd379824b7890d4b24ae19769c142f72d (diff) | |
Merge branch 'hotfix/0.11.0.8'0.11.0.8
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d1d702616..a8ba52e4f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -27,7 +27,6 @@ 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 def set_vary_header response.headers['Vary'] = 'Cookie' @@ -540,9 +539,6 @@ class ApplicationController < ActionController::Base return country end - def set_popup_banner - @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 # all of all. |