activesupport 3.1.0.rc3 → 3.1.0.rc4

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activesupport might be problematic. Click here for more details.

@@ -51,7 +51,8 @@ class ERB
51
51
  # <%=j @person.to_json %>
52
52
  #
53
53
  def json_escape(s)
54
- s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
54
+ result = s.to_s.gsub(/[&"><]/) { |special| JSON_ESCAPE[special] }
55
+ s.html_safe? ? result.html_safe : result
55
56
  end
56
57
 
57
58
  alias j json_escape
@@ -3,7 +3,7 @@ module ActiveSupport
3
3
  MAJOR = 3
4
4
  MINOR = 1
5
5
  TINY = 0
6
- PRE = "rc3"
6
+ PRE = "rc4"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activesupport
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424099
4
+ hash: 15424109
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 1
9
9
  - 0
10
10
  - rc
11
- - 3
12
- version: 3.1.0.rc3
11
+ - 4
12
+ version: 3.1.0.rc4
13
13
  platform: ruby
14
14
  authors:
15
15
  - David Heinemeier Hansson
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2011-06-08 00:00:00 Z
20
+ date: 2011-06-09 00:00:00 Z
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
23
23
  name: multi_json