diff options
| author | Michael Koziarski <michael@koziarski.com> | 2009-08-09 13:10:14 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2009-08-09 13:10:14 +1200 |
| commit | b97d2933747767a1aeacb9594f3d376f5791fc3a (patch) | |
| tree | 535bf879fbdae93ad623787b741a47db9a1c7799 /actionpack/lib | |
| parent | 271baf235d6e197a6ecd25945c34df0385137764 (diff) | |
| parent | 370bf1401af62c8589d557cd51b9533dd603c463 (diff) | |
| download | rails-b97d2933747767a1aeacb9594f3d376f5791fc3a.tar.gz rails-b97d2933747767a1aeacb9594f3d376f5791fc3a.tar.bz2 rails-b97d2933747767a1aeacb9594f3d376f5791fc3a.zip | |
Merge branch 'patches'
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/atom_feed_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/atom_feed_helper.rb b/actionpack/lib/action_view/helpers/atom_feed_helper.rb index dc4497581c..9951e11a37 100644 --- a/actionpack/lib/action_view/helpers/atom_feed_helper.rb +++ b/actionpack/lib/action_view/helpers/atom_feed_helper.rb @@ -98,7 +98,7 @@ module ActionView options[:schema_date] = "2005" # The Atom spec copyright date end - xml = options[:xml] || eval("xml", block.binding) + xml = options.delete(:xml) || eval("xml", block.binding) xml.instruct! if options[:instruct] options[:instruct].each do |target,attrs| |