diff options
author | Roque Pinel <repinel@gmail.com> | 2015-06-09 22:11:20 -0400 |
---|---|---|
committer | Roque Pinel <repinel@gmail.com> | 2015-06-09 22:26:42 -0400 |
commit | c70aee8eea066d911410f40974a3ee9d387cd834 (patch) | |
tree | a4aa860d0ddefcc070f9923e6a8ad0d91f4be31c | |
parent | 3d949f34816d6eca0a6b59cfa08d91f36e8e64dd (diff) | |
download | rails-c70aee8eea066d911410f40974a3ee9d387cd834.tar.gz rails-c70aee8eea066d911410f40974a3ee9d387cd834.tar.bz2 rails-c70aee8eea066d911410f40974a3ee9d387cd834.zip |
Use block variable instead of global
-rw-r--r-- | activerecord/lib/active_record/sanitization.rb | 4 | ||||
-rw-r--r-- | activesupport/lib/active_support/inflector/methods.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb index c2567311bd..ba75ffa5a1 100644 --- a/activerecord/lib/active_record/sanitization.rb +++ b/activerecord/lib/active_record/sanitization.rb @@ -119,9 +119,9 @@ module ActiveRecord end def replace_named_bind_variables(statement, bind_vars) #:nodoc: - statement.gsub(/(:?):([a-zA-Z]\w*)/) do + statement.gsub(/(:?):([a-zA-Z]\w*)/) do |match| if $1 == ':' # skip postgresql casts - $& # return the whole match + match # return the whole match elsif bind_vars.include?(match = $2.to_sym) replace_bind_variable(bind_vars[match]) else diff --git a/activesupport/lib/active_support/inflector/methods.rb b/activesupport/lib/active_support/inflector/methods.rb index 49fd1723e2..be369d21c6 100644 --- a/activesupport/lib/active_support/inflector/methods.rb +++ b/activesupport/lib/active_support/inflector/methods.rb @@ -153,7 +153,7 @@ module ActiveSupport # titleize('TheManWithoutAPast') # => "The Man Without A Past" # titleize('raiders_of_the_lost_ark') # => "Raiders Of The Lost Ark" def titleize(word) - humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { $&.capitalize } + humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { |match| match.capitalize } end # Creates the name of a table like Rails does for models to table names. |