Update method to compile block templates

sinatra · Oct 4, 2021 · b3a85e1 · b3a85e1
1 parent ac1c251
commit b3a85e1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -903,9 +903,10 @@ def compile_template(engine, data, options, views)
     end
 
     def compile_block_template(template, options, &body)
-      caller = settings.caller_locations.first
-      path = options[:path] || caller[0]
-      line = options[:line] || caller[1]
+      first_location = caller_locations.first
+      path, line = first_location.path, first_location.lineno
+      path = options[:path] || path
+      line = options[:line] || line
       template.new(path, line.to_i, options, &body)
     end
   end