Correct merge issues in the last merge from master

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

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index e1f23ac74b7301c3207930530bd30352f56e12e8..390806f80a3268f8d53ce7f694aaa0c1de2ee046 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -1,8 +1,8 @@
 class RelationController < ApplicationController
   require 'xml/libxml'
 
 class RelationController < ApplicationController
   require 'xml/libxml'
 

-  session :off

   before_filter :authorize, :only => [:create, :update, :delete]
   before_filter :authorize, :only => [:create, :update, :delete]

+  before_filter :require_allow_write_api, :only => [:create, :update, :delete]

   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :check_api_writable, :only => [:create, :update, :delete]
   before_filter :check_api_readable, :except => [:create, :update, :delete]
   before_filter :require_public_data, :only => [:create, :update, :delete]
   before_filter :check_api_writable, :only => [:create, :update, :delete]
   before_filter :check_api_readable, :except => [:create, :update, :delete]