diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-26 01:03:35 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-26 01:03:35 +0000 |
| commit | 673b5cc3939e9abc3bc1f5984f2a61ed45b70529 (patch) | |
| tree | 5b02800891270972a8946518f37fb807f2b9b7d8 /app/controllers/user_controller.rb | |
| parent | 0e546a79b205124d7b95b89e4a2e9cc520a4fc10 (diff) | |
| parent | 6d7bea575ec185379efb648f6bbbd520029e3a91 (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 45b71a3a9..f49fc9165 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -489,7 +489,8 @@ class UserController < ApplicationController raise ActiveRecord::RecordNotFound.new("user not found, url_name=" + params[:url_name]) end if !@display_user.profile_photo - raise "user has no profile photo, url_name=" + params[:url_name] + raise ActiveRecord::RecordNotFound.new("user has no profile photo, url_name=" + params[:url_name]) + end response.content_type = "image/png" |