Merge 12304:14009 from trunk.

2009-03-08 13:02:37 +00:00 · 2009-03-08 13:02:37 +00:00 · c8ee135104
commit c8ee135104
parent 0272d30b96 fa3c97d6a6
36 changed files with 174 additions and 130 deletions
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@ -27,8 +27,7 @@ class Relation < ActiveRecord::Base

  def self.from_xml(xml, create=false)
    begin
-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)
      doc = p.parse

      doc.find('//osm/relation').each do |pt|