aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--activesupport/lib/active_support/json.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb
index 1e8ded12da..6d845182fb 100644
--- a/activesupport/lib/active_support/json.rb
+++ b/activesupport/lib/active_support/json.rb
@@ -43,10 +43,10 @@ module ActiveSupport
delegate :decode, :to => :backend
def backend
- @backend || begin
+ unless defined? @backend
self.backend = defined?(::JSON) ? "JSONGem" : "Yaml"
- @backend
end
+ @backend
end
def backend=(name)