1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00

Merge pull request #57 from aishafenton/master

StdLib JSON library not being found.
This commit is contained in:
Konstantin Haase 2012-07-08 02:17:25 -07:00
commit 74c191ffd5

View file

@ -125,7 +125,7 @@ module Sinatra
Base.set :json_encoder do
return Yajl::Encoder if defined? Yajl::Encoder
return JSON if defined? JSON
return ::JSON if defined? ::JSON
return :to_json if {}.respond_to? :to_json and [].respond_to? :to_json
Sinatra::JSON
end