X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/107e9515b35544cb8e4ac66838b9a37f95cdfa89..6f89da05d1741ac66deab93aea64b76dc1e9b8fb:/app/controllers/relation_controller.rb

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index 846d623f2..97e832049 100644
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -15,7 +15,7 @@ class RelationController < ApplicationController
     relation = Relation.from_xml(request.raw_post, true)
 
     # Assume that Relation.from_xml has thrown an exception if there is an error parsing the xml
-    relation.create_with_history @user
+    relation.create_with_history current_user
     render :plain => relation.id.to_s
   end
 
@@ -39,7 +39,7 @@ class RelationController < ApplicationController
       raise OSM::APIBadUserInput.new("The id in the url (#{relation.id}) is not the same as provided in the xml (#{new_relation.id})")
     end
 
-    relation.update_from new_relation, @user
+    relation.update_from new_relation, current_user
     render :plain => relation.version.to_s
   end
 
@@ -47,7 +47,7 @@ class RelationController < ApplicationController
     relation = Relation.find(params[:id])
     new_relation = Relation.from_xml(request.raw_post)
     if new_relation && new_relation.id == relation.id
-      relation.delete_with_history!(new_relation, @user)
+      relation.delete_with_history!(new_relation, current_user)
       render :plain => relation.version.to_s
     else
       head :bad_request