aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/string
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/core_ext/string')
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb7
-rw-r--r--activesupport/lib/active_support/core_ext/string/xchar.rb2
2 files changed, 3 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 3977971e8d..567ba00b0d 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -71,15 +71,12 @@ module ActiveSupport #:nodoc:
super(ERB::Util.h(value))
end
end
+ alias << concat
def +(other)
dup.concat(other)
end
- def <<(value)
- self.concat(value)
- end
-
def html_safe?
true
end
@@ -102,4 +99,4 @@ class String
def html_safe
ActiveSupport::SafeBuffer.new(self)
end
-end \ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/core_ext/string/xchar.rb b/activesupport/lib/active_support/core_ext/string/xchar.rb
index 7183218634..f9a5b4fb64 100644
--- a/activesupport/lib/active_support/core_ext/string/xchar.rb
+++ b/activesupport/lib/active_support/core_ext/string/xchar.rb
@@ -1,5 +1,5 @@
begin
- # See http://bogomips.org/fast_xs/ by Eric Wong.
+ # See http://fast-xs.rubyforge.org/ by Eric Wong.
# Also included with hpricot.
require 'fast_xs'
rescue LoadError