diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-11 15:05:44 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-11 15:05:44 -0700 |
| commit | 565b500c2e11a5a0cc2460c0b7e80d0fe03f865e (patch) | |
| tree | 5184a161743c8d2bbc5f018d0fc1bbfd40185ccf /app/controllers/user_controller.rb | |
| parent | 613e1ec06dc07cff91c1bcef88c2493b52402df7 (diff) | |
| parent | e1d5d1fdd379824b7890d4b24ae19769c142f72d (diff) | |
Merge branch 'hotfix/0.11.0.8' into wdtk
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]) |