Merge 12304:14009 from trunk.

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

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 6be1061591dda7b665b20ceed5b5b81ae79e96d3..64af4ecc1eb9d59eff27e8b46d292f3a2aa560f6 100644 (file)
--- 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|