diff options
author | Henare Degan <henare.degan@gmail.com> | 2013-02-27 10:34:47 +1100 |
---|---|---|
committer | Henare Degan <henare.degan@gmail.com> | 2013-02-27 10:34:47 +1100 |
commit | 835b51c1de0d49e652fe9c9a60f0974275de070c (patch) | |
tree | 0d64a841f28654a66556bcc0c0bb1153bae645a2 /app/controllers/user_controller.rb | |
parent | 77a284d6d088f7aa6d40810d46a39658fc6cf2cd (diff) |
Rename ALL THE TEMPLATES!!1!!!one!!1!!
.rhtml is deprecated in favour of .erb in Rails 3
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r-- | app/controllers/user_controller.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index d20308937..80c27ffd4 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -222,7 +222,7 @@ class UserController < ApplicationController post_redirect = PostRedirect.find_by_email_token(params[:email_token]) if post_redirect.nil? - render :template => 'user/bad_token.rhtml' + render :template => 'user/bad_token' return end @@ -465,7 +465,7 @@ class UserController < ApplicationController @draft_profile_photo = ProfilePhoto.new(:data => file_content, :draft => true) if !@draft_profile_photo.valid? # error page (uses @profile_photo's error fields in view to show errors) - render :template => 'user/set_draft_profile_photo.rhtml' + render :template => 'user/set_draft_profile_photo' return end @draft_profile_photo.save @@ -480,7 +480,7 @@ class UserController < ApplicationController return end - render :template => 'user/set_crop_profile_photo.rhtml' + render :template => 'user/set_crop_profile_photo' return elsif !params[:submitted_crop_profile_photo].nil? # crop the draft photo according to jquery parameters and set it as the users photo @@ -499,7 +499,7 @@ class UserController < ApplicationController redirect_to set_profile_about_me_url() end else - render :template => 'user/set_draft_profile_photo.rhtml' + render :template => 'user/set_draft_profile_photo' end end |