diff options
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/filters.rb | 6 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/filters.rb b/activesupport/lib/active_support/core_ext/string/filters.rb index 3a69131ea0..0329fbb8d4 100644 --- a/activesupport/lib/active_support/core_ext/string/filters.rb +++ b/activesupport/lib/active_support/core_ext/string/filters.rb @@ -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 diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index d839415e49..01acc50763 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -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( |