diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-28 05:42:12 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-28 05:42:12 +0000 |
| commit | 7555073803ffb455715b74664a0cfb48c271fe89 (patch) | |
| tree | c3729911796be98a9ad48c5bee6da6402f050ffb /actionpack/lib/action_controller/base.rb | |
| parent | 16558f6dd83d514f783ed13e9bc24d6b66e5aefd (diff) | |
| download | rails-7555073803ffb455715b74664a0cfb48c271fe89.tar.gz rails-7555073803ffb455715b74664a0cfb48c271fe89.tar.bz2 rails-7555073803ffb455715b74664a0cfb48c271fe89.zip | |
Ruby 1.9 compat: introduce instance_variable_names. Closes #10630 [Frederick Cheung]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index ff77e036fb..3818960979 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1210,7 +1210,7 @@ module ActionController #:nodoc: def add_instance_variables_to_assigns @@protected_variables_cache ||= Set.new(protected_instance_variables) - instance_variables.each do |var| + instance_variable_names.each do |var| next if @@protected_variables_cache.include?(var) @assigns[var[1..-1]] = instance_variable_get(var) end |