Remove all use of the :text option to render

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 197b2891404c599046311e3a8ff5e48fd6c77023..2ff9646e649a2c8784df78ec58891558cadc9446 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -81,7 +81,7 @@ class UserController < ApplicationController
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true
 
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true
 

-        if @user.auth_uid.nil? || @user.auth_uid.empty?
+        if @user.auth_uid.blank?

           @user.auth_provider = nil
           @user.auth_uid = nil
         end
           @user.auth_provider = nil
           @user.auth_uid = nil
         end


@@ -194,7 +194,7 @@ class UserController < ApplicationController
         redirect_to :action => "lost_password"
       end
     else
         redirect_to :action => "lost_password"
       end
     else

-      render :text => "", :status => :bad_request
+      head :bad_request

     end
   end
 
     end
   end
 


@@ -375,7 +375,7 @@ class UserController < ApplicationController
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else
     if @this_user.visible?
       render :action => :api_read, :content_type => "text/xml"
     else

-      render :text => "", :status => :gone
+      head :gone

     end
   end
 
     end
   end
 


@@ -389,7 +389,7 @@ class UserController < ApplicationController
     @user.traces.reload.each do |trace|
       doc.root << trace.to_xml_node
     end
     @user.traces.reload.each do |trace|
       doc.root << trace.to_xml_node
     end

-    render :text => doc.to_s, :content_type => "text/xml"
+    render :xml => doc.to_s

   end
 
   def view
   end
 
   def view


@@ -437,7 +437,7 @@ class UserController < ApplicationController
     if @friend
       if request.post?
         if @user.is_friends_with?(@friend)
     if @friend
       if request.post?
         if @user.is_friends_with?(@friend)

-          Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}"
+          Friend.where(:user_id => @user.id, :friend_user_id => @friend.id).delete_all

           flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name
           flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name


@@ -752,9 +752,7 @@ class UserController < ApplicationController
   ##
   # require that the user in the URL is the logged in user
   def require_self
   ##
   # require that the user in the URL is the logged in user
   def require_self

-    if params[:display_name] != @user.display_name
-      render :text => "", :status => :forbidden
-    end
+    head :forbidden if params[:display_name] != @user.display_name

   end
 
   ##
   end
 
   ##