aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/atom_feed_helper.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2009-08-09 13:07:50 +1200
committerMichael Koziarski <michael@koziarski.com>2009-08-09 13:10:08 +1200
commit370bf1401af62c8589d557cd51b9533dd603c463 (patch)
treea0ff31680f4fff26f6c31f940e24921a35026faa /actionpack/lib/action_view/helpers/atom_feed_helper.rb
parent45f5bdfbc7fc1ee1fbc23525a112062c8b31d539 (diff)
downloadrails-370bf1401af62c8589d557cd51b9533dd603c463.tar.gz
rails-370bf1401af62c8589d557cd51b9533dd603c463.tar.bz2
rails-370bf1401af62c8589d557cd51b9533dd603c463.zip
Don't call additional methods on builders passed to the atom_feed helper.
Additionally, actually test that the atom_feed helper works with :xml as an option. [#1836 state:committed]
Diffstat (limited to 'actionpack/lib/action_view/helpers/atom_feed_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/atom_feed_helper.rb2
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|