aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-24 01:50:24 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-24 01:50:24 +0000
commit842ce34bbcfb2d65b04a6e80bf8c168d7c17277d (patch)
treeb675a3ffe4a8e080888b4c7bf5c497b6760bf892 /activerecord/lib
parentd37604f03ee9af7cf2d65ec2e1be986342a965c5 (diff)
downloadrails-842ce34bbcfb2d65b04a6e80bf8c168d7c17277d.tar.gz
rails-842ce34bbcfb2d65b04a6e80bf8c168d7c17277d.tar.bz2
rails-842ce34bbcfb2d65b04a6e80bf8c168d7c17277d.zip
Fixtures: correct escaping of \n and \r. Closes #5859.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4811 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/fixtures.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index 9062a96f41..f1aa1c1087 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -396,7 +396,7 @@ class Fixture #:nodoc:
list = @fixture.inject([]) do |fixtures, (key, value)|
col = klass.columns_hash[key] if klass.kind_of?(ActiveRecord::Base)
- fixtures << ActiveRecord::Base.connection.quote(value, col).gsub('\\n', "\n").gsub('\\r', "\r")
+ fixtures << ActiveRecord::Base.connection.quote(value, col).gsub('[^\]\\n', "\n").gsub('[^\]\\r', "\r")
end
list * ', '
end