AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

blargh

Browse Source
This commit is contained in:
Charlie Somerville
2014-05-30 16:59:24 -07:00
parent 52abaed4b3
commit 1d5bb4fd20
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
activesupport/lib/active_support/core_ext/string/output_safety.rb
View File

@@ -126,9 +126,7 @@ module ActiveSupport #:nodoc:
super
else
if html_safe?
new_safe_buffer = super
new_safe_buffer.instance_eval { @html_safe = true }
new_safe_buffer
super._gh_html_safe!
else
to_str[*args]
end
@@ -136,18 +134,18 @@ module ActiveSupport #:nodoc:
end
def safe_concat(value)
raise SafeConcatError unless @html_safe
raise SafeConcatError unless html_safe?
original_concat(value)
end
def initialize(*)
@html_safe = true
_gh_html_safe!
super
end
def initialize_copy(other)
super
@html_safe = other.html_safe?
_gh_html_safe_if!(other)
end
def clone_empty
@@ -179,10 +177,6 @@ module ActiveSupport #:nodoc:
self.class.new(super(args))
end
def html_safe?
defined?(@html_safe) && @html_safe
end
def to_s
self
end
@@ -204,7 +198,7 @@ module ActiveSupport #:nodoc:
end # end
def #{unsafe_method}!(*args) # def capitalize!(*args)
@html_safe = false # @html_safe = false
_gh_unset_html_safe! # _gh_unset_html_safe!
super # super
end # end
EOT