Merge pull request #714 from bhollis/link_to

3.0.8/3.0.9 breaks middleman-blog's `tag_path` method
This commit is contained in:
Thomas Reynolds 2013-01-08 22:53:09 -08:00
commit 8e7a87e167

View file

@ -176,15 +176,14 @@ module Middleman
end end
end end
end end
end
# Support a :query option that can be a string or hash # Support a :query option that can be a string or hash
query = options.delete(:query) if query = options.delete(:query)
if query
uri = URI(args[url_arg_index]) uri = URI(args[url_arg_index])
uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s uri.query = query.respond_to?(:to_param) ? query.to_param : query.to_s
args[url_arg_index] = uri.to_s args[url_arg_index] = uri.to_s
end end
end
super(*args, &block) super(*args, &block)
end end