Rename ALL THE TEMPLATES!!1!!!one!!1!!

.rhtml is deprecated in favour of .erb in Rails 3

4 files changed, 8 insertions, 8 deletions

diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
index 80dbd730c..45a898759 100644
--- a/app/controllers/admin_request_controller.rb
+++ b/app/controllers/admin_request_controller.rb
@@ -48,7 +48,7 @@ class AdminRequestController < AdminController
                 :info_request => @info_request, :reason => params[:reason],
                 :info_request_url => 'http://' + Configuration::domain + request_url(@info_request),
                 :site_name => site_name)
-        template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.rhtml"))
+        template = File.read(File.join(File.dirname(__FILE__), "..", "views", "admin_request", "hidden_user_explanation.html.erb"))
         @request_hidden_user_explanation = ERB.new(template).result(vars.instance_eval { binding })
     end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2a2b29bfe..04fd0ed0e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -145,7 +145,7 @@ class ApplicationController < ActionController::Base
         @exception_backtrace = exception.backtrace.join("\n")
         @exception_class = exception.class.to_s
         @exception_message = exception.message
-        render :template => "general/exception_caught.rhtml", :status => @status
+        render :template => "general/exception_caught", :status => @status
     end
 
     # FIXME: This was disabled during the Rails 3 upgrade as this is now handled by Rack
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 0c51d278f..c8da8e845 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -893,7 +893,7 @@ class RequestController < ApplicationController
         # by making the last work a wildcard, which is quite the same
         query = params[:q]
         @xapian_requests = perform_search_typeahead(query, InfoRequestEvent)
-        render :partial => "request/search_ahead.rhtml"
+        render :partial => "request/search_ahead"
     end
 
     def download_entire_request
@@ -941,7 +941,7 @@ class RequestController < ApplicationController
                         end
                         if !done
                             @info_request_events = @info_request.info_request_events
-                            template = File.read(File.join(File.dirname(__FILE__), "..", "views", "request", "simple_correspondence.rhtml"))
+                            template = File.read(File.join(File.dirname(__FILE__), "..", "views", "request", "simple_correspondence.html.erb"))
                             output = ERB.new(template).result(binding)
                             zipfile.get_output_stream("correspondence.txt") { |f|
                                 f.puts(output)
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