Merge pull request #13072 from kuldeepaggarwal/unwanted-code

unnecessary checking of `size` with `second regex` if matched with former regex
rails · Nov 27, 2013 · f15bd23 · f15bd23
2 parents fbe5baa + fff0309
commit f15bd23
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb
@@ -208,8 +208,11 @@ def image_tag(source, options={})
         end
 
         if size = options.delete(:size)
-          options[:width], options[:height] = size.split("x") if size =~ %r{\A\d+x\d+\z}
+          if size =~ %r{\A\d+x\d+\z}
-          options[:width] = options[:height] = size if size =~ %r{\A\d+\z}
+            options[:width], options[:height] = size.split('x')
+          elsif size =~ %r{\A\d+\z}
+            options[:width] = options[:height] = size
+          end
         end
 
         tag("img", options)