X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/87918595da1e1fad2ddd7aa62f9fc537dff657ff..647a3a7d3951b1bf7ab7034796e44f1cd2541347:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index e418e103f..e25d3c8b6 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -411,8 +411,8 @@ class UserController < ApplicationController if @new_friend if request.post? friend = Friend.new - friend.user_id = current_user.id - friend.friend_user_id = @new_friend.id + friend.befriender = current_user + friend.befriendee = @new_friend if current_user.is_friends_with?(@new_friend) flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name elsif friend.save