diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 07:55:31 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-08-31 07:55:31 +0000 |
commit | c1af2db14be7a5978ee57e6b46f02e1ec8bc14f9 (patch) | |
tree | a4bea79c139419583b9d6c77e55a31a5987dfb4a /activeresource/lib | |
parent | 12ff554cd476bd2c653d9fd331bbcabb71363f3a (diff) | |
download | rails-c1af2db14be7a5978ee57e6b46f02e1ec8bc14f9.tar.gz rails-c1af2db14be7a5978ee57e6b46f02e1ec8bc14f9.tar.bz2 rails-c1af2db14be7a5978ee57e6b46f02e1ec8bc14f9.zip |
site= accepts URIs
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4886 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activeresource/lib')
-rw-r--r-- | activeresource/lib/active_resource/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 2d4025e5dd..11064454d7 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -4,9 +4,9 @@ module ActiveResource class Base class << self def site=(site) - @@site = URI.parse(site) + @@site = site.is_a?(URI) ? site : URI.parse(site) end - + def site @@site end @@ -96,4 +96,4 @@ module ActiveResource end end end -end
\ No newline at end of file +end |