Merge remote-tracking branch 'upstream/pull/3647'

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

diff --git a/app/controllers/friendships_controller.rb b/app/controllers/friendships_controller.rb
index 5cdb2a4e4323ea11645383bea4ebf94edeb2561b..5bfce7f0b27d617ae3c93848290e93c45cc0c5bb 100644 (file)
--- a/app/controllers/friendships_controller.rb
+++ b/app/controllers/friendships_controller.rb
@@ -17,9 +17,9 @@ class FriendshipsController < ApplicationController
         friendship = Friendship.new
         friendship.befriender = current_user
         friendship.befriendee = @new_friend
         friendship = Friendship.new
         friendship.befriender = current_user
         friendship.befriendee = @new_friend

-        if current_user.is_friends_with?(@new_friend)
+        if current_user.friends_with?(@new_friend)

           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name
           flash[:warning] = t "friendships.make_friend.already_a_friend", :name => @new_friend.display_name

-        elsif current_user.friendships.where("created_at >= ?", Time.now.getutc - 1.hour).count >= current_user.max_friends_per_hour
+        elsif current_user.friendships.where("created_at >= ?", Time.now.utc - 1.hour).count >= current_user.max_friends_per_hour

           flash.now[:error] = t "friendships.make_friend.limit_exceeded"
         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name
           flash.now[:error] = t "friendships.make_friend.limit_exceeded"
         elsif friendship.save
           flash[:notice] = t "friendships.make_friend.success", :name => @new_friend.display_name


@@ -28,11 +28,9 @@ class FriendshipsController < ApplicationController
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 
           friendship.add_error(t("friendships.make_friend.failed", :name => @new_friend.display_name))
         end
 

-        if params[:referer]
-          redirect_to safe_referer(params[:referer])
-        else
-          redirect_to user_path
-        end
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || user_path

       end
     else
       render_unknown_user params[:display_name]
       end
     else
       render_unknown_user params[:display_name]


@@ -44,18 +42,16 @@ class FriendshipsController < ApplicationController
 
     if @friend
       if request.post?
 
     if @friend
       if request.post?

-        if current_user.is_friends_with?(@friend)
+        if current_user.friends_with?(@friend)

           Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all
           flash[:notice] = t "friendships.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "friendships.remove_friend.not_a_friend", :name => @friend.display_name
         end
 
           Friendship.where(:befriender => current_user, :befriendee => @friend).delete_all
           flash[:notice] = t "friendships.remove_friend.success", :name => @friend.display_name
         else
           flash[:error] = t "friendships.remove_friend.not_a_friend", :name => @friend.display_name
         end
 

-        if params[:referer]
-          redirect_to safe_referer(params[:referer])
-        else
-          redirect_to user_path
-        end
+        referer = safe_referer(params[:referer]) if params[:referer]
+
+        redirect_to referer || user_path

       end
     else
       render_unknown_user params[:display_name]
       end
     else
       render_unknown_user params[:display_name]