From be79632b96d6fe6b844c99561ce96f540e98cae0 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@garaio.com>
Date: Mon, 12 Nov 2012 14:33:20 +0100
Subject: backport #8185, `#as_json` isolates options when encoding a hash.

Setting options in a custom `#as_json` method had side effects.
Modifications of the `options` hash leaked outside and influenced
the conversion of other objects contained in the hash.

Conflicts:

	activesupport/CHANGELOG.md
---
 activesupport/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'activesupport/CHANGELOG.md')

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 749441e343..d15c341b9f 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 3.2.10 (unreleased)
 
+*   `#as_json` isolates options when encoding a hash. [Backport #8185]
+    Fix #8182
+
+    *Yves Senn*
+
 *   Handle the possible Permission Denied errors atomic.rb might trigger due to
     its chown and chmod calls. [Backport #8027]
 
-- 
cgit v1.2.3