Skip to content

Preserve unsafe_load defaults with second-argument options #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
OskarEichler wants to merge 1 commit into from
+6 −6
Closed

Preserve unsafe_load defaults with second-argument options #1066

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/json/common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,13 +698,13 @@ def pretty_generate(obj, opts = nil)
# @attributes={"type"=>"Admin", "password"=>"0wn3d"}>}
#
def unsafe_load(source, proc = nil, options = nil)
if proc && options.nil? && proc.is_a?(Hash)
options = proc
proc = nil
end

opts = if options.nil?
if proc && proc.is_a?(Hash)
options, proc = proc, nil
options
else
_unsafe_load_default_options
end
_unsafe_load_default_options
else
_unsafe_load_default_options.merge(options)
end
Expand Down