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/user_controller.rb | |
| parent | 7e0ff79a97d9085d60f88d9d211102a758eb3087 (diff) | |
| parent | e1d5d1fdd379824b7890d4b24ae19769c142f72d (diff) | |
Merge branch 'hotfix/0.11.0.8'0.11.0.8
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 b7912b528..e21315eb6 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -532,6 +532,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]) |