Merge branch 'master' into moderation

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index c6e4780eb7dd16dada98581cd4613edc125078c3..c2e7f18394a8769ec284ecb276d45af329f16477 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -85,8 +85,10 @@ class DiffReader
   def with_model
     with_element do |model_name, _model_attributes|
       model = MODELS[model_name]
   def with_model
     with_element do |model_name, _model_attributes|
       model = MODELS[model_name]

-      raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
-                                     "expected node, way or relation.") if model.nil?
+      if model.nil?
+        raise OSM::APIBadUserInput.new("Unexpected element type #{model_name}, " +
+                                       "expected node, way or relation.")
+      end

       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,
       # which means basically nothing works.
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,
       # which means basically nothing works.