Added JSON support to user preferences

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

diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index a983bec751442d36a31b26f79b8fca595ad024ea..0bff13df6efb573c478798eabc3e69bde3c3fc1d 100644 (file)
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -21,13 +21,13 @@ class FriendshipsController < ApplicationController
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name

-          Notifier.friendship_notification(friendship).deliver_later
+          UserMailer.friendship_notification(friendship).deliver_later

         else
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 
         if params[:referer]
         else
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 
         if params[:referer]

-          redirect_to params[:referer]
+          redirect_to safe_referer(params[:referer])

         else
           redirect_to user_path
         end
         else
           redirect_to user_path
         end


@@ -50,7 +50,7 @@ class FriendshipsController < ApplicationController
         end
 
         if params[:referer]
         end
 
         if params[:referer]

-          redirect_to params[:referer]
+          redirect_to safe_referer(params[:referer])

         else
           redirect_to user_path
         end
         else
           redirect_to user_path
         end