From c1af2db14be7a5978ee57e6b46f02e1ec8bc14f9 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 31 Aug 2006 07:55:31 +0000
Subject: site= accepts URIs

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4886 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activeresource/lib/active_resource/base.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'activeresource/lib/active_resource')

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
-- 
cgit v1.2.3