remove should_pop variable

rails · May 12, 2014 · d94cd86 · d94cd86
1 parent ad31afe
commit d94cd86
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
@@ -133,11 +133,9 @@ def polymorphic_url(record_or_hash_or_array, options = {})
         end
 
         inflection = lambda { |name| name.singular_route_key }
-        should_pop = true
 
         if options[:action] == 'new'
         elsif record.try(:persisted?)
-          should_pop = false
         else
           inflection = lambda { |name| name.route_key }
         end
@@ -162,10 +160,9 @@ def polymorphic_url(record_or_hash_or_array, options = {})
           when Symbol, String
             record.to_s
           when Class
-            args << record unless should_pop
             inflection.call record.model_name
           else
-            args << record.to_model unless should_pop
+            args << record.to_model if record.persisted?
             inflection.call record.to_model.class.model_name
           end