Fix issue with passed routes and provides

sinatra · Feb 12, 2016 · 75ab338 · 75ab338
1 parent fdd17eb
commit 75ab338
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -970,8 +970,12 @@ def route!(base = settings, pass_block = nil)
             route_eval { block[*args] }
           end
 
-          # don't wipe out pass_block in superclass
-          pass_block = returned_pass_block if returned_pass_block
+          if returned_pass_block
+            # don't wipe out pass_block in superclass
+            pass_block = returned_pass_block
+            # prevent passed route from pinning the content type
+            response['Content-Type'] = nil
+          end
         end
       end