Merged 14009:14059 from trunk.

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 7b90659d841ef4436f315a5fb38e0c68690f0d81..d420f537a2472d8fe0a0f0058dee62952dd8adcf 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -46,15 +46,14 @@ class Changeset < ActiveRecord::Base
   end
 
   def set_closed_time_now
-    unless is_open?
+    if is_open?
       self.closed_at = Time.now
     end
   end
   
   def self.from_xml(xml, create=false)
     begin
-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)
       doc = p.parse
 
       cs = Changeset.new