Update to rails 3.2.9

[rails.git] / app / models / old_way.rb

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index ec4bb5136baaa79bf3ce560b017455f83844f7db..bc114d73a512dd49fcad30aebabf02bdb8141974 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -104,26 +104,21 @@ class OldWay < ActiveRecord::Base
     el1['version'] = self.version.to_s
     el1['changeset'] = self.changeset.id.to_s
 
-    if self.redacted?
-      el1['redacted'] = self.redaction.title
-    end
+    el1['redacted'] = self.redaction.id.to_s if self.redacted?
     
-    unless self.redacted? and (@user.nil? or not @user.moderator?)
-      # If a way is redacted and the user isn't a moderator, only show
-      # meta-data from this revision, but no real data.
-      self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
-        e = XML::Node.new 'nd'
-        e['ref'] = nd.node_id.to_s
-        el1 << e
-      end
+    self.old_nodes.each do |nd| # FIXME need to make sure they come back in the right order
+      e = XML::Node.new 'nd'
+      e['ref'] = nd.node_id.to_s
+      el1 << e
+    end
       
-      self.old_tags.each do |tag|
-        e = XML::Node.new 'tag'
-        e['k'] = tag.k
-        e['v'] = tag.v
-        el1 << e
-      end
+    self.old_tags.each do |tag|
+      e = XML::Node.new 'tag'
+      e['k'] = tag.k
+      e['v'] = tag.v
+      el1 << e
     end
+
     return el1
   end