aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2007-04-24 16:06:41 +0000
committerRick Olson <technoweenie@gmail.com>2007-04-24 16:06:41 +0000
commitb3c4e301f490be57677aa3137329522e572b1d0f (patch)
treebe3d252a6345c2b034f0a23221fcfc5212219b48 /activeresource
parent2df386ad532d96f298d3322f57508ccaa85676aa (diff)
downloadrails-b3c4e301f490be57677aa3137329522e572b1d0f.tar.gz
rails-b3c4e301f490be57677aa3137329522e572b1d0f.tar.bz2
rails-b3c4e301f490be57677aa3137329522e572b1d0f.zip
dont bother merging in prefix_options
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/lib/active_resource/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 8d5567c42c..cd1f07e294 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -143,7 +143,7 @@ module ActiveResource
prefix_options, query_options = split_options(options)
collection = connection.get(collection_path(prefix_options, query_options)) || []
collection.collect! do |element|
- returning new(element.merge(prefix_options)) do |resource|
+ returning new(element) do |resource|
resource.prefix_options = prefix_options
end
end