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/user_controller.rb | |
| parent | 5edbf3bc1660a2fd4d66ee1aec41c316a653142a (diff) | |
| parent | b899d542efe424be83cf512c61e8cc0c5e3f0b1a (diff) | |
Merge commit '0.11.0.8' into rails-3-develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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]) |