Applied the faster squish version (closes #11123) [jordi]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9015 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2008-03-13 02:25:10 +00:00
parent bcb47a843b
commit 9d4fa7c4a7
2 changed files with 5 additions and 3 deletions

View File

@@ -11,12 +11,14 @@ module ActiveSupport #:nodoc:
# string }.squish # => "Multi-line string"
# " foo bar \n \t boo".squish # => "foo bar boo"
def squish
strip.gsub(/\s+/, ' ')
dup.squish!
end
# Performs a destructive squish. See String#squish.
def squish!
replace(squish)
strip!
gsub!(/\s+/, ' ')
self
end
end
end

View File

@@ -255,7 +255,7 @@ module Rails
logger.auto_flushing = false
logger.set_non_blocking_io
end
rescue StandardError =>e
rescue StandardError => e
logger = ActiveSupport::BufferedLogger.new(STDERR)
logger.level = ActiveSupport::BufferedLogger::WARN
logger.warn(