Get OAuth working, including a hack for Potlatch

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 51d0049a792961cecbfb9b28234940bb908fbc34..c45b211d43aa5f4ed4a04f846bec85451f7b2965 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -4,6 +4,7 @@ class ChangesetController < ApplicationController
   layout 'site'
   require 'xml/libxml'
 
+  skip_before_filter :verify_authenticity_token, :except => [:list]
   before_filter :authorize_web, :only => [:list]
   before_filter :set_locale, :only => [:list]
   before_filter :authorize, :only => [:create, :update, :delete, :upload, :include, :close]
@@ -177,7 +178,7 @@ class ChangesetController < ApplicationController
           created << elt.to_xml_node
         else
           # get the previous version from the element history
-          prev_elt = elt.class.where(:id => elt.id, :version => elt.version).first
+          prev_elt = elt.class.find([elt.id, elt.version])
           unless elt.visible
             # if the element isn't visible then it must have been deleted, so
             # output the *previous* XML