diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/user_controller.rb | 1 |
2 files changed, 1 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. diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 1ccab3003..1bf5a5316 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -536,6 +536,7 @@ class UserController < ApplicationController # actual profile photo of a user def get_profile_photo + long_cache @display_user = User.find(:first, :conditions => [ "url_name = ? and email_confirmed = ?", params[:url_name], true ]) if !@display_user raise ActiveRecord::RecordNotFound.new("user not found, url_name=" + params[:url_name]) |