aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-20 11:10:48 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-20 11:10:48 -0800
commitb31c2ed367e7ee4779d9b292b4b45e7b7daec27d (patch)
treee11ae79e753f516fa7cbbf50715219ce0ec01afc
parentcc192900f231a216dd16f93796fd3c2569da1ed1 (diff)
parentc01124ece64433c4e0dac30b00cd0a6f51edf102 (diff)
downloadrails-b31c2ed367e7ee4779d9b292b4b45e7b7daec27d.tar.gz
rails-b31c2ed367e7ee4779d9b292b4b45e7b7daec27d.tar.bz2
rails-b31c2ed367e7ee4779d9b292b4b45e7b7daec27d.zip
Merge pull request #4075 from arunagw/activeresource_dead_code_removal
Removal dead code from my side :-)
-rw-r--r--activeresource/lib/active_resource/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index 10cc727bd9..548990cb70 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -1413,7 +1413,7 @@ module ActiveResource
namespaces = module_names[0, module_names.size-1].map do |module_name|
receiver = receiver.const_get(module_name)
end
- const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+ const_args = [resource_name, false]
if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(*const_args) }
namespace.const_get(*const_args)
else
@@ -1425,7 +1425,7 @@ module ActiveResource
def find_or_create_resource_for(name)
resource_name = name.to_s.camelize
- const_args = RUBY_VERSION < "1.9" ? [resource_name] : [resource_name, false]
+ const_args = [resource_name, false]
if self.class.const_defined?(*const_args)
self.class.const_get(*const_args)
else