diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-11 16:14:55 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-11 16:14:55 -0700 |
| commit | b1b5f97cd5d84698d10841c977431756e975b216 (patch) | |
| tree | c2b430c3e26093b690d37c07d16aa6e09ce2c428 /app/controllers/application_controller.rb | |
| parent | 5edbf3bc1660a2fd4d66ee1aec41c316a653142a (diff) | |
| parent | b899d542efe424be83cf512c61e8cc0c5e3f0b1a (diff) | |
Merge commit '0.11.0.8' into rails-3-develop
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 dffc16b63..c9ad48693 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' @@ -543,9 +542,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. |