From 3bde2e68c3b9b56e95092845f37798573a514bda Mon Sep 17 00:00:00 2001
From: Aish <aisha.fenton@visfleet.com>
Date: Sat, 7 Jul 2012 19:09:13 -0700
Subject: [PATCH] Fixes issue that is preventing stdlib JSON library from being
 set as the default encoder.

---
 sinatra-contrib/lib/sinatra/json.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sinatra-contrib/lib/sinatra/json.rb b/sinatra-contrib/lib/sinatra/json.rb
index b54fea9b..2efaa3a1 100644
--- a/sinatra-contrib/lib/sinatra/json.rb
+++ b/sinatra-contrib/lib/sinatra/json.rb
@@ -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