2 files changed, 11 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index 5b2cb6e331..664537eea4 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -34,9 +34,9 @@ class String
   # Form can be either :utc (default) or :local.
   def to_time(form = :utc)
     return nil if self.blank?
-    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction).map { |arg| arg || 0 }
+    d = ::Date._parse(self, false).values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset).map { |arg| arg || 0 }
     d[6] *= 1000000
-    ::Time.send("#{form}_time", *d)
+    ::Time.send("#{form}_time", *d[0..6]) - d[7]
   end
 
   def to_date
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 a19b5c95c7..3bf4edbdef 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -67,7 +67,7 @@ class Object
   end
 end
 
-class Fixnum
+class Numeric
   def html_safe?
     true
   end
@@ -137,14 +137,14 @@ module ActiveSupport #:nodoc:
 
     UNSAFE_STRING_METHODS.each do |unsafe_method|
       class_eval <<-EOT, __FILE__, __LINE__
-        def #{unsafe_method}(*args, &block)
-          to_str.#{unsafe_method}(*args, &block)
-        end
-
-        def #{unsafe_method}!(*args)
-          @dirty = true
-          super
-        end
+        def #{unsafe_method}(*args, &block)       # def gsub(*args, &block)
+          to_str.#{unsafe_method}(*args, &block)  #   to_str.gsub(*args, &block)
+        end                                       # end
+
+        def #{unsafe_method}!(*args)              # def gsub!(*args)
+          @dirty = true                           #   @dirty = true
+          super                                   #   super
+        end                                       # end
       EOT
     end